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

(svn r10628) -Fix (r10606,FS#1055): Revert r10606 and fix the plural problem another way.

Browse Source
This commit is contained in:
peter1138
2007-07-19 17:28:55 +00:00
parent 58a3b5e60d
commit d93fcea1f8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf.cpp
View File

@@ -1532,11 +1532,11 @@ static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int le
break;
case 0x09: /* String ID for cargo type name */
cs->name_plural = grf_load_word(&buf);
cs->name = grf_load_word(&buf);
break;
case 0x0A: /* String for 1 unit of cargo */
cs->name = grf_load_word(&buf);
cs->name_single = grf_load_word(&buf);
break;
case 0x0B:
@@ -5259,7 +5259,7 @@ static void MapNewCargoStrings()
if (!cs->IsValid() || cs->grfid == 0) continue;
cs->name = MapGRFStringID(cs->grfid, cs->name);
cs->name_plural = MapGRFStringID(cs->grfid, cs->name_plural);
cs->name_single = MapGRFStringID(cs->grfid, cs->name_single);
cs->units_volume = MapGRFStringID(cs->grfid, cs->units_volume);
cs->quantifier = MapGRFStringID(cs->grfid, cs->quantifier);
cs->abbrev = MapGRFStringID(cs->grfid, cs->abbrev);