(svn r15740) -Codechange: make code in namegen.cpp ~50% faster, apply coding style and add comments

This commit is contained in:
smatz 2009-03-16 10:51:49 +00:00
parent 5f57ea7198
commit d23c9f7a6c
3 changed files with 552 additions and 394 deletions

File diff suppressed because it is too large Load Diff

View File

@ -2,11 +2,9 @@
/** @file namegen_func.h Town name generator stuff. */
#ifndef NAMEGEN_H
#define NAMEGEN_H
#ifndef NAMEGEN_FUNC_H
#define NAMEGEN_FUNC_H
typedef byte TownNameGenerator(char *buf, uint32 seed, const char *last);
char *GenerateTownNameString(char *buf, const char *last, size_t lang, uint32 seed);
extern TownNameGenerator * const _town_name_generators[];
#endif /* NAMEGEN_H */
#endif /* NAMEGEN_FUNC_H */

View File

@ -1084,10 +1084,7 @@ static char *StationGetSpecialString(char *buff, int x, const char *last)
static char *GetSpecialTownNameString(char *buff, int ind, uint32 seed, const char *last)
{
char name[512];
_town_name_generators[ind](name, seed, lastof(name));
return strecpy(buff, name, last);
return GenerateTownNameString(buff, last, ind, seed);
}
static const char * const _silly_company_names[] = {