(svn r4777) - NewGRF: moving warning message about feature callbacks above station code and change minimum length for action 3 from 7 to 6 bytes.

This commit is contained in:
peter1138 2006-05-07 17:43:03 +00:00
parent e12003b1a5
commit a56ef34f8d
1 changed files with 9 additions and 10 deletions

View File

@ -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