mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-01-22 15:11:54 +00:00
(svn r11381) -Fix [FS#1227]: redo the fix in a less breaking way
This commit is contained in:
parent
6c9617b4ae
commit
3517ee6d54
@ -5426,7 +5426,7 @@ void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage)
|
||||
_cur_grffile = GetFileByFilename(filename);
|
||||
if (_cur_grffile == NULL) error("File '%s' lost in cache.\n", filename);
|
||||
if (stage == GLS_RESERVE && config->status != GCS_INITIALISED) return;
|
||||
if (stage == GLS_ACTIVATION && config->status != GCS_INITIALISED) return;
|
||||
if (stage == GLS_ACTIVATION && !HASBIT(config->flags, GCF_RESERVED)) return;
|
||||
}
|
||||
|
||||
if (file_index > LAST_GRF_SLOT) {
|
||||
@ -5560,8 +5560,9 @@ void LoadNewGRF(uint load_index, uint file_index)
|
||||
if (stage == GLS_LABELSCAN) InitNewGRFFile(c, _cur_spriteid);
|
||||
LoadNewGRFFile(c, slot++, stage);
|
||||
if (stage == GLS_RESERVE) {
|
||||
if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED;
|
||||
SETBIT(c->flags, GCF_RESERVED);
|
||||
} else if (stage == GLS_ACTIVATION) {
|
||||
CLRBIT(c->flags, GCF_RESERVED);
|
||||
ClearTemporaryNewGRFData();
|
||||
BuildCargoTranslationMap();
|
||||
DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur_spriteid);
|
||||
|
@ -15,6 +15,7 @@ enum GCF_Flags {
|
||||
GCF_COMPATIBLE,///< GRF file does not exactly match the requested GRF (different MD5SUM), but grfid matches)
|
||||
GCF_COPY, ///< The data is copied from a grf in _all_grfs
|
||||
GCF_INIT_ONLY, ///< GRF file is processed up to GLS_INIT
|
||||
GCF_RESERVED, ///< GRF file passed GLS_RESERVE stage
|
||||
};
|
||||
|
||||
enum GRFStatus {
|
||||
|
Loading…
Reference in New Issue
Block a user