mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r21127) -Codechange: change the max gender constant's name's style to the style used by the max case constant's name

release/1.1
rubidium 2010-11-10 16:31:46 +00:00
parent 7c7a0cc3f7
commit 15defb219f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/strgen/strgen.cpp
View File

@ -78,8 +78,8 @@ static int _put_pos;
static int _next_string_id; static int _next_string_id;
static uint32 _hash; static uint32 _hash;
#define MAX_NUM_GENDER 8 #define MAX_NUM_GENDERS 8
static char _genders[MAX_NUM_GENDER][16]; static char _genders[MAX_NUM_GENDERS][16];
static uint _numgenders; static uint _numgenders;
/* contains the name of all cases. */ /* contains the name of all cases. */
@ -378,14 +378,14 @@ static void EmitGender(char *buf, int value)
/* This is a {G=DER} command */ /* This is a {G=DER} command */
for (nw = 0; ; nw++) { for (nw = 0; ; nw++) {
if (nw >= MAX_NUM_GENDER) error("G argument '%s' invalid", buf); if (nw >= MAX_NUM_GENDERS) error("G argument '%s' invalid", buf);
if (strcmp(buf, _genders[nw]) == 0) break; if (strcmp(buf, _genders[nw]) == 0) break;
} }
/* now nw contains the gender index */ /* now nw contains the gender index */
PutUtf8(SCC_GENDER_INDEX); PutUtf8(SCC_GENDER_INDEX);
PutByte(nw); PutByte(nw);
} else { } else {
const char *words[MAX_NUM_GENDER]; const char *words[MAX_NUM_GENDERS];
/* This is a {G 0 foo bar two} command. /* This is a {G 0 foo bar two} command.
* If no relative number exists, default to +0 */ * If no relative number exists, default to +0 */
@ -396,7 +396,7 @@ static void EmitGender(char *buf, int value)
error("Command '%s' can't have a gender", cmd == NULL ? "<empty>" : cmd->cmd); error("Command '%s' can't have a gender", cmd == NULL ? "<empty>" : cmd->cmd);
} }
for (nw = 0; nw < MAX_NUM_GENDER; nw++) { for (nw = 0; nw < MAX_NUM_GENDERS; nw++) {
words[nw] = ParseWord(&buf); words[nw] = ParseWord(&buf);
if (words[nw] == NULL) break; if (words[nw] == NULL) break;
} }
@ -559,7 +559,7 @@ static void HandlePragma(char *str, bool master)
const char *s = ParseWord(&buf); const char *s = ParseWord(&buf);
if (s == NULL) break; if (s == NULL) break;
if (_numgenders >= MAX_NUM_GENDER) error("Too many genders, max %d", MAX_NUM_GENDER); if (_numgenders >= MAX_NUM_GENDERS) error("Too many genders, max %d", MAX_NUM_GENDERS);
strecpy(_genders[_numgenders], s, lastof(_genders[_numgenders])); strecpy(_genders[_numgenders], s, lastof(_genders[_numgenders]));
_numgenders++; _numgenders++;
} }