diff options
| author | smatz <smatz@openttd.org> | 2009-08-11 14:57:09 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-08-11 14:57:09 +0000 |
| commit | 624a1948b198c7d92ef4bf6a9528389385b4d0b3 (patch) | |
| tree | f9fb0dcf5fa3470e19900614ccc3f8b0074c30d6 | |
| parent | d77b5b562c9c7a700434e6601358f01dbb6c1097 (diff) | |
| download | openttd-624a1948b198c7d92ef4bf6a9528389385b4d0b3.tar.xz | |
(svn r17154) -Fix (r11129): several times copypasted typo
| -rw-r--r-- | src/newgrf.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index e7e83fa22..5fe35a72d 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -288,28 +288,28 @@ StringID MapGRFStringID(uint32 grfid, StringID str) default: break; } -#define TEXID_TO_STRINGID(begin, end, stringid) if (str >= begin && str <= end) return str + (stringid - begin) +#define TEXTID_TO_STRINGID(begin, end, stringid) if (str >= begin && str <= end) return str + (stringid - begin) /* We have some changes in our cargo strings, resulting in some missing. */ - TEXID_TO_STRINGID(0x000E, 0x002D, STR_CARGO_PLURAL_NOTHING); - TEXID_TO_STRINGID(0x002E, 0x004D, STR_CARGO_SINGULAR_NOTHING); + TEXTID_TO_STRINGID(0x000E, 0x002D, STR_CARGO_PLURAL_NOTHING); + TEXTID_TO_STRINGID(0x002E, 0x004D, STR_CARGO_SINGULAR_NOTHING); if (str >= 0x004E && str <= 0x006D) return units_volume[str - 0x004E]; - TEXID_TO_STRINGID(0x006E, 0x008D, STR_QUANTITY_NOTHING); - TEXID_TO_STRINGID(0x008E, 0x00AD, STR_ABBREV_NOTHING); + TEXTID_TO_STRINGID(0x006E, 0x008D, STR_QUANTITY_NOTHING); + TEXTID_TO_STRINGID(0x008E, 0x00AD, STR_ABBREV_NOTHING); /* Map building names according to our lang file changes. There are several * ranges of house ids, all of which need to be remapped to allow newgrfs * to use original house names. */ - TEXID_TO_STRINGID(0x200F, 0x201F, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1); - TEXID_TO_STRINGID(0x2036, 0x2041, STR_TOWN_BUILDING_NAME_COTTAGES_1); - TEXID_TO_STRINGID(0x2059, 0x205C, STR_TOWN_BUILDING_NAME_IGLOO_1); + TEXTID_TO_STRINGID(0x200F, 0x201F, STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1); + TEXTID_TO_STRINGID(0x2036, 0x2041, STR_TOWN_BUILDING_NAME_COTTAGES_1); + TEXTID_TO_STRINGID(0x2059, 0x205C, STR_TOWN_BUILDING_NAME_IGLOO_1); /* Same thing for industries */ - TEXID_TO_STRINGID(0x4802, 0x4826, STR_INDUSTRY_NAME_COAL_MINE); - TEXID_TO_STRINGID(0x4827, 0x4829, STR_INDUSTRY_VIEW_REQUIRES_CARGO); - TEXID_TO_STRINGID(0x482D, 0x482E, STR_NEWS_INDUSTRY_CONSTRUCTION); - TEXID_TO_STRINGID(0x4832, 0x4834, STR_NEWS_INDUSTRY_CLOSURE_GENERAL); - TEXID_TO_STRINGID(0x4835, 0x4838, STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL); - TEXID_TO_STRINGID(0x4839, 0x483A, STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL); + TEXTID_TO_STRINGID(0x4802, 0x4826, STR_INDUSTRY_NAME_COAL_MINE); + TEXTID_TO_STRINGID(0x4827, 0x4829, STR_INDUSTRY_VIEW_REQUIRES_CARGO); + TEXTID_TO_STRINGID(0x482D, 0x482E, STR_NEWS_INDUSTRY_CONSTRUCTION); + TEXTID_TO_STRINGID(0x4832, 0x4834, STR_NEWS_INDUSTRY_CLOSURE_GENERAL); + TEXTID_TO_STRINGID(0x4835, 0x4838, STR_NEWS_INDUSTRY_PRODUCTION_INCREASE_GENERAL); + TEXTID_TO_STRINGID(0x4839, 0x483A, STR_NEWS_INDUSTRY_PRODUCTION_DECREASE_GENERAL); switch (str) { case 0x4830: return STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY; |