From 0ceca4140a8e369f78ba310d45d587e7a88094b8 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sat, 24 Mar 2007 23:43:33 +0000 Subject: [PATCH] (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 --- src/newgrf.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 55751b151c..535e49387e 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, },