dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for

Browse Source 
each STR_ entry. This avoids the need for a cast to StringID in some 
places and thus better type-safety.
This commit is contained in:
peter1138
2007-08-03 09:08:49 +00:00
parent f95df6bb61
commit 23a46a301e
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/strings.cpp
View File

@@ -696,7 +696,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
* 8bit - cargo type
* 16-bit - cargo count */
CargoID cargo = GetInt32(&argv);
StringID cargo_str = (cargo == CT_INVALID) ? (StringID)STR_8838_N_A : GetCargo(cargo)->quantifier;
StringID cargo_str = (cargo == CT_INVALID) ? STR_8838_N_A : GetCargo(cargo)->quantifier;
buff = GetStringWithArgs(buff, cargo_str, argv++, last);
break;
}
@@ -852,7 +852,7 @@ static char* FormatString(char* buff, const char* str, const int64* argv, uint c
assert(g->IsValid());
args[0] = g->index;
buff = GetStringWithArgs(buff, IsCustomName(g->string_id) ? g->string_id : (StringID)STR_GROUP_NAME_FORMAT, args, last);
buff = GetStringWithArgs(buff, IsCustomName(g->string_id) ? g->string_id : STR_GROUP_NAME_FORMAT, args, last);
break;
}