(svn r2306) - CodeChange: Check the last commands; refits. This needed an extensive rewrite and global/local-cargo ID juggling and bitmasking. However with this done it looks better as well and is compatible with newgrf handling. Big thanks to HackyKid for doing most of the work. This also closes patch "[ 1199277 ] Command checks"

1 files changed, 2 insertions, 3 deletions

diff --git a/newgrf.c b/newgrf.c
index 30c5a8f06..3607326aa 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -1450,8 +1450,7 @@ static void NewVehicle_SpriteGroupMapping(byte *buf, int len)
 				return;
 			}
 
-			if (ctype == 0xFF)
-				ctype = CID_PURCHASE;
+			if (ctype == GC_INVALID) ctype = GC_PURCHASE;
 
 			if (wagover) {
 				// TODO: No multiple cargo types per vehicle yet. --pasky
@@ -1482,7 +1481,7 @@ static void NewVehicle_SpriteGroupMapping(byte *buf, int len)
 				// TODO: No multiple cargo types per vehicle yet. --pasky
 				SetWagonOverrideSprites(engine, &_cur_grffile->spritegroups[groupid], last_engines, last_engines_count);
 			} else {
-				SetCustomEngineSprites(engine, CID_DEFAULT, &_cur_grffile->spritegroups[groupid]);
+				SetCustomEngineSprites(engine, GC_DEFAULT, &_cur_grffile->spritegroups[groupid]);
 				last_engines[i] = engine;
 			}
 		}