mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r11494) -Fix [FS#1461] (r11450): cargo translation table was now loaded too late ;)

This commit is contained in:
glx 2007-11-22 22:37:06 +00:00
parent 64a4ac3444
commit b979995795
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/newgrf.cpp
View File

@ -2103,7 +2103,7 @@ static void FeatureChangeInfo(byte *buf, int len)
/* GSF_CANAL */ NULL,
/* GSF_BRIDGE */ BridgeChangeInfo,
/* GSF_TOWNHOUSE */ TownHouseChangeInfo,
/* GSF_GLOBALVAR */ GlobalVarChangeInfo,
/* GSF_GLOBALVAR */ NULL, /* Global variables are handled during reservation */
/* GSF_INDUSTRYTILES */IndustrytilesChangeInfo,
/* GSF_INDUSTRIES */ IndustriesChangeInfo,
/* GSF_CARGOS */ NULL, /* Cargo is handled during reservation */
@ -2227,7 +2227,7 @@ static void ReserveChangeInfo(byte *buf, int len)
buf++;
uint8 feature = grf_load_byte(&buf);
if (feature != GSF_CARGOS) return;
if (feature != GSF_CARGOS && feature != GSF_GLOBALVAR) return;
uint8 numprops = grf_load_byte(&buf);
uint8 numinfo = grf_load_byte(&buf);
@ -2235,10 +2235,19 @@ static void ReserveChangeInfo(byte *buf, int len)
while (numprops-- && buf < bufend) {
uint8 prop = grf_load_byte(&buf);
bool ignoring = false;
if (CargoChangeInfo(index, numinfo, prop, &buf, bufend - buf)) {
grfmsg(2, "ReserveChangeInfo: Ignoring property 0x%02X (not implemented)", prop);
switch (feature) {
default: NOT_REACHED();
case GSF_CARGOS:
ignoring = CargoChangeInfo(index, numinfo, prop, &buf, bufend - buf);
break;
case GSF_GLOBALVAR:
ignoring = GlobalVarChangeInfo(index, numinfo, prop, &buf, bufend - buf);
break;
}
if (ignoring) grfmsg(2, "ReserveChangeInfo: Ignoring property 0x%02X (not implemented)", prop);
}
}