mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11196) -Fix (r11191): _cur_stage was incorrect for GLS_ACTIVATION stage

release/0.6
glx 2007-10-02 20:20:14 +00:00
parent a5e8761325
commit dca398e9a6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf.cpp
View File

@ -5508,13 +5508,17 @@ void LoadNewGRF(uint load_index, uint file_index)
if (!FioCheckFileExists(c->filename)) error("NewGRF file is missing '%s'", c->filename); if (!FioCheckFileExists(c->filename)) error("NewGRF file is missing '%s'", c->filename);
if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid); if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
LoadNewGRFFile(c, slot++, stage); LoadNewGRFFile(c, slot, stage);
if (stage == GLS_RESERVE) { if (stage == GLS_RESERVE) {
if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED; if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED;
_cur_stage = GLS_ACTIVATION;
LoadNewGRFFile(c, slot++, GLS_ACTIVATION); LoadNewGRFFile(c, slot++, GLS_ACTIVATION);
_cur_stage = stage;
ClearTemporaryNewGRFData(); ClearTemporaryNewGRFData();
BuildCargoTranslationMap(); BuildCargoTranslationMap();
DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid); DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid);
} else {
slot++;
} }
} }
} }