diff -r 66d273b07706 src/newgrf.cpp --- a/src/newgrf.cpp Thu Jun 28 19:24:26 2012 +0000 +++ b/src/newgrf.cpp Fri Jun 29 15:34:15 2012 +0200 @@ -4367,11 +4367,13 @@ /* Action 0x01 */ static void NewSpriteSet(ByteReader *buf) { - /* <01> + /* Basic format: <01> + * Extended format: <01> 00 * * B feature feature to define sprites for * 0, 1, 2, 3: veh-type, 4: train stations - * B num-sets number of sprite sets + * E first-set first sprite set to define + * B num-sets number of sprite sets (extended byte in extended format) * E num-ent how many entries per sprite set * For vehicles, this is the number of different * vehicle directions in each sprite set @@ -4379,8 +4381,8 @@ * In that case, use num-dirs=4. */ - uint8 feature = buf->ReadByte(); - uint8 num_sets = buf->ReadByte(); + uint8 feature = buf->ReadByte(); + uint16 num_sets = buf->ReadByte(); uint16 first_set = 0; if (num_sets == 0 && buf->HasData(2)) { @@ -4407,7 +4409,15 @@ static void SkipAct1(ByteReader *buf) { buf->ReadByte(); - uint8 num_sets = buf->ReadByte(); + uint16 num_sets = buf->ReadByte(); + uint16 first_set = 0; + + if (num_sets == 0 && buf->HasData(2)) { + /* Extended Action1 format. + * Some GRFs define zero sets of zero sprites, though there is actually no use in that. Ignore them. */ + first_set = buf->ReadExtendedByte(); + num_sets = buf->ReadExtendedByte(); + } uint16 num_ents = buf->ReadExtendedByte(); _cur.skip_sprites = num_sets * num_ents;