diff options
author | peter1138 <peter1138@openttd.org> | 2007-08-03 09:08:49 +0000 |
---|---|---|
committer | peter1138 <peter1138@openttd.org> | 2007-08-03 09:08:49 +0000 |
commit | 616eb4134eac435bea86d738475f718309f7c5ea (patch) | |
tree | b6337974657d183b3d4648de552643ab63470cc7 /src/strings.cpp | |
parent | d6c915e6a631b76bcb1459f2509a142298a2daf8 (diff) | |
download | openttd-616eb4134eac435bea86d738475f718309f7c5ea.tar.xz |
(svn r10762) -Codechange: Change enum StringIDEnum { to static const StringID = for
each STR_ entry. This avoids the need for a cast to StringID in some
places and thus better type-safety.
Diffstat (limited to 'src/strings.cpp')
-rw-r--r-- | src/strings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index c10855a0c..78df8facd 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -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; } |