Mercurial > hg > openttd
changeset 6096:e229761beb17 draft
(svn r8831) -Feature: If an action 7/9 leads to skipping the rest of the file, disable the
newgrf if an action 8 hasn't been encountered yet.
author | maedhros <maedhros@openttd.org> |
---|---|
date | Wed, 21 Feb 2007 17:54:30 +0000 |
parents | 5ba18c4c3b47 |
children | 0a7a812e54ea |
files | src/newgrf.cpp |
diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -2535,6 +2535,9 @@ * 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 @@ 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