Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8831) -Feature: If an action 7/9 leads to skipping the rest of the file, disable the

Browse Source 
newgrf if an action 8 hasn't been encountered yet.
This commit is contained in:
maedhros 2007-02-21 17:54:30 +00:00
parent 61fa3909f2
commit 9907e496b1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf.cpp
View File

@ -2535,6 +2535,9 @@ static void SkipIf(byte *buf, int len)
* we use -1 to indicate that all further
* sprites should be skipped. */
_skip_sprites = -1;
/* If an action 8 hasn't been encountered yet, disable the grf. */
if (!HASBIT(_cur_grfconfig->flags, GCF_ACTIVATED)) SETBIT(_cur_grfconfig->flags, GCF_DISABLED);
}
}
@ -3768,6 +3771,8 @@ void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage)
if (stage == GLS_ACTIVATION && !HASBIT(config->flags, GCF_ACTIVATED)) return;
}
if (stage == GLS_ACTIVATION) CLRBIT(config->flags, GCF_ACTIVATED);
FioOpenFile(file_index, filename);
_file_index = file_index; // XXX