gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 10:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r21224) -Fix [FS#4172]: [NewGRF] The specs' cargo strings and OpenTTD's use of the clashed. Provide properties so NewGRFs can provide cargo strings tailored for OpenTTD while retaining (some) backward compatability

Browse Source
This commit is contained in:
rubidium 2010-11-17 18:35:59 +00:00
parent 602a0f10fa
commit 7826b78415
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf.cpp
View File

@ -2097,14 +2097,20 @@ static ChangeInfoResult CargoChangeInfo(uint cid, int numinfo, int prop, ByteRea
_string_to_grf_mapping[&cs->name_single] = _cur_grffile->grfid; _string_to_grf_mapping[&cs->name_single] = _cur_grffile->grfid;
break; break;
case 0x0B: case 0x0B: // String for singular quantity of cargo (e.g. 1 tonne of coal)
/* String for units of cargo. This is different in OpenTTD to TTDPatch case 0x1B: // String for cargo units
* (e.g. 10 tonnes of coal) */ /* String for units of cargo. This is different in OpenTTD
* (e.g. tonnes) to TTDPatch (e.g. {COMMA} tonne of coal).
* Property 1B is used to set OpenTTD's behaviour. */
cs->units_volume = buf->ReadWord(); cs->units_volume = buf->ReadWord();
_string_to_grf_mapping[&cs->units_volume] = _cur_grffile->grfid; _string_to_grf_mapping[&cs->units_volume] = _cur_grffile->grfid;
break; break;
case 0x0C: // String for quantity of cargo (e.g. 10 tonnes of coal) case 0x0C: // String for plural quantity of cargo (e.g. 10 tonnes of coal)
case 0x1C: // String for any amount of cargo
/* Strings for an amount of cargo. This is different in OpenTTD
* (e.g. {WEIGHT} of coal) to TTDPatch (e.g. {COMMA} tonnes of coal).
* Property 1C is used to set OpenTTD's behaviour. */
cs->quantifier = buf->ReadWord(); cs->quantifier = buf->ReadWord();
_string_to_grf_mapping[&cs->quantifier] = _cur_grffile->grfid; _string_to_grf_mapping[&cs->quantifier] = _cur_grffile->grfid;
break; break;