summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-11-10 16:31:46 +0000
committerrubidium <rubidium@openttd.org>2010-11-10 16:31:46 +0000
commit15defb219f44738cf301d494a16576dffca26de3 (patch)
tree8f3b601d1c65fb91f2ebdbf963723fab7001e343
parent7c7a0cc3f7327cd2c28ae7dd538c0600a8b9a534 (diff)
downloadopenttd-15defb219f44738cf301d494a16576dffca26de3.tar.xz
(svn r21127) -Codechange: change the max gender constant's name's style to the style used by the max case constant's name
-rw-r--r--src/strgen/strgen.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index 8382b7b0b..a752cdc40 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -78,8 +78,8 @@ static int _put_pos;
static int _next_string_id;
static uint32 _hash;
-#define MAX_NUM_GENDER 8
-static char _genders[MAX_NUM_GENDER][16];
+#define MAX_NUM_GENDERS 8
+static char _genders[MAX_NUM_GENDERS][16];
static uint _numgenders;
/* contains the name of all cases. */
@@ -378,14 +378,14 @@ static void EmitGender(char *buf, int value)
/* This is a {G=DER} command */
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;
}
/* now nw contains the gender index */
PutUtf8(SCC_GENDER_INDEX);
PutByte(nw);
} else {
- const char *words[MAX_NUM_GENDER];
+ const char *words[MAX_NUM_GENDERS];
/* This is a {G 0 foo bar two} command.
* 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);
}
- for (nw = 0; nw < MAX_NUM_GENDER; nw++) {
+ for (nw = 0; nw < MAX_NUM_GENDERS; nw++) {
words[nw] = ParseWord(&buf);
if (words[nw] == NULL) break;
}
@@ -559,7 +559,7 @@ static void HandlePragma(char *str, bool master)
const char *s = ParseWord(&buf);
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]));
_numgenders++;
}