Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r14697) -Fix: some int vs unsigned int comparisons in strgen.

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
rubidium 16 years ago
parent 59fca8523f
commit 395cb45039
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
src/strgen/strgen.cpp
Unescape Escape View File

@ -90,12 +90,12 @@ static byte _lang_textdir;
static uint16 _lang_winlangid; static uint16 _lang_winlangid;
#define MAX_NUM_GENDER 8 #define MAX_NUM_GENDER 8
static char _genders[MAX_NUM_GENDER][16]; static char _genders[MAX_NUM_GENDER][16];
static int _numgenders; static uint _numgenders;
// contains the name of all cases. // contains the name of all cases.
#define MAX_NUM_CASES 50 #define MAX_NUM_CASES 50
static char _cases[MAX_NUM_CASES][16]; static char _cases[MAX_NUM_CASES][16];
static int _numcases; static uint _numcases;
// for each plural value, this is the number of plural forms. // for each plural value, this is the number of plural forms.
static const byte _plural_form_counts[] = { 2, 1, 2, 3, 3, 3, 3, 3, 4, 2 }; static const byte _plural_form_counts[] = { 2, 1, 2, 3, 3, 3, 3, 3, 4, 2 };
@ -108,7 +108,7 @@ struct CmdPair {
}; };
struct ParsedCommandStruct { struct ParsedCommandStruct {
int np; uint np;
CmdPair pairs[32]; CmdPair pairs[32];
const CmdStruct *cmd[32]; // ordered by param # const CmdStruct *cmd[32]; // ordered by param #
}; };
@ -704,7 +704,7 @@ static void ExtractCommandString(ParsedCommandStruct* p, const char* s, bool war
if (ar->consumes) { if (ar->consumes) {
if (argno != -1) argidx = argno; if (argno != -1) argidx = argno;
if (argidx < 0 || argidx >= lengthof(p->cmd)) error("invalid param idx %d", argidx); if (argidx < 0 || (uint)argidx >= lengthof(p->cmd)) error("invalid param idx %d", argidx);
if (p->cmd[argidx] != NULL && p->cmd[argidx] != ar) error("duplicate param idx %d", argidx); if (p->cmd[argidx] != NULL && p->cmd[argidx] != ar) error("duplicate param idx %d", argidx);
p->cmd[argidx++] = ar; p->cmd[argidx++] = ar;
@ -741,7 +741,7 @@ static bool CheckCommandsMatch(char *a, char *b, const char *name)
{ {
ParsedCommandStruct templ; ParsedCommandStruct templ;
ParsedCommandStruct lang; ParsedCommandStruct lang;
int i, j; uint i, j;
bool result = true; bool result = true;
ExtractCommandString(&templ, b, true); ExtractCommandString(&templ, b, true);
@ -1073,7 +1073,7 @@ static int TranslateArgumentIdx(int argidx)
{ {
int i, sum; int i, sum;
if (argidx < 0 || argidx >= lengthof(_cur_pcs.cmd)) if (argidx < 0 || (uint)argidx >= lengthof(_cur_pcs.cmd))
error("invalid argidx %d", argidx); error("invalid argidx %d", argidx);
for (i = sum = 0; i < argidx; i++) { for (i = sum = 0; i < argidx; i++) {

Write Preview
Loading…
Cancel
Save