diff options
| author | peter1138 <peter1138@openttd.org> | 2007-03-24 23:43:33 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-03-24 23:43:33 +0000 |
| commit | 0ceca4140a8e369f78ba310d45d587e7a88094b8 (patch) | |
| tree | 1f13787b3807915713f1f0a4624f95074deb5eb2 | |
| parent | fc540fcd0de8a47cdba81ac0283ffbe92a469c7f (diff) | |
| download | openttd-0ceca4140a8e369f78ba310d45d587e7a88094b8.tar.xz | |
(svn r9436) -Fix (r9411): don't deactivate GRF in an action 7/9 during reservation (and loading of cargo data), and action 6 should be run also
| -rw-r--r-- | src/newgrf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 55751b151..535e49387 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -3142,7 +3142,7 @@ static void SkipIf(byte *buf, int len) _skip_sprites = -1; /* If an action 8 hasn't been encountered yet, disable the grf. */ - if (_cur_grfconfig->status != GCS_ACTIVATED) _cur_grfconfig->status = GCS_DISABLED; + if (_cur_stage != GLS_RESERVE && _cur_grfconfig->status != GCS_ACTIVATED) _cur_grfconfig->status = GCS_DISABLED; } } @@ -4515,7 +4515,7 @@ static void DecodeSpecialSprite(uint num, GrfLoadingStage stage) /* 0x03 */ { NULL, GRFUnsafe, NULL, NULL, NULL, FeatureMapSpriteGroup, }, /* 0x04 */ { NULL, NULL, NULL, NULL, NULL, FeatureNewName, }, /* 0x05 */ { NULL, NULL, NULL, NULL, NULL, GraphicsNew, }, - /* 0x06 */ { NULL, NULL, NULL, CfgApply, NULL, CfgApply, }, + /* 0x06 */ { NULL, NULL, NULL, CfgApply, CfgApply, CfgApply, }, /* 0x07 */ { NULL, NULL, NULL, NULL, SkipIf, SkipIf, }, /* 0x08 */ { ScanInfo, NULL, NULL, GRFInfo, NULL, GRFInfo, }, /* 0x09 */ { NULL, NULL, NULL, SkipIf, SkipIf, SkipIf, }, |