From a56ef34f8d715bced7a39f2f979aa4f8f0c24515 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sun, 7 May 2006 17:43:03 +0000 Subject: [PATCH] (svn r4777) - NewGRF: moving warning message about feature callbacks above station code and change minimum length for action 3 from 7 to 6 bytes. --- newgrf.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/newgrf.c b/newgrf.c index 5f879063f8..55d6ba8863 100644 --- a/newgrf.c +++ b/newgrf.c @@ -1559,11 +1559,19 @@ static void NewVehicle_SpriteGroupMapping(byte *buf, int len) uint8 cidcount; int c, i; - check_length(len, 7, "VehicleMapSpriteGroup"); + check_length(len, 6, "VehicleMapSpriteGroup"); feature = buf[1]; idcount = buf[2] & 0x7F; wagover = (buf[2] & 0x80) == 0x80; check_length(len, 3 + idcount, "VehicleMapSpriteGroup"); + + /* If ``n-id'' (or ``idcount'') is zero, this is a ``feature + * callback''. */ + if (idcount == 0) { + grfmsg(GMS_WARN, "VehicleMapSpriteGroup: Feature callbacks not implemented yet."); + return; + } + cidcount = buf[3 + idcount]; check_length(len, 4 + idcount + cidcount * 3, "VehicleMapSpriteGroup"); @@ -1625,15 +1633,6 @@ static void NewVehicle_SpriteGroupMapping(byte *buf, int len) return; } - - /* If ``n-id'' (or ``idcount'') is zero, this is a ``feature - * callback''. I have no idea how this works, so we will ignore it for - * now. --octo */ - if (idcount == 0) { - grfmsg(GMS_NOTICE, "NewMapping: Feature callbacks not implemented yet."); - return; - } - // FIXME: Tropicset contains things like: // 03 00 01 19 01 00 00 00 00 - this is missing one 00 at the end, // what should we exactly do with that? --pasky