summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2012-06-29 15:38:41 +0000
committerfrosch <frosch@openttd.org>2012-06-29 15:38:41 +0000
commit37d41d44483e6866ede6029553b67b9456990089 (patch)
treeece8b95a274f6f507ca4560cef7b37136252870a /src
parentee25344a6d50ec4f4443570566254152b3b33c67 (diff)
downloadopenttd-37d41d44483e6866ede6029553b67b9456990089.tar.xz
(svn r24361) -Fix [FS#5227] (r22926): Apparently ext. A1 did not work at all. (Hirundo)
Diffstat (limited to 'src')
-rw-r--r--src/newgrf.cpp22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index d27faf57d..451d181a3 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -4367,11 +4367,13 @@ static void ReserveChangeInfo(ByteReader *buf)
/* Action 0x01 */
static void NewSpriteSet(ByteReader *buf)
{
- /* <01> <feature> <num-sets> <num-ent>
+ /* Basic format: <01> <feature> <num-sets> <num-ent>
+ * Extended format: <01> <feature> 00 <first-set> <num-sets> <num-ent>
*
* 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,11 +4381,11 @@ static void NewSpriteSet(ByteReader *buf)
* 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)) {
+ if (num_sets == 0 && buf->HasData(3)) {
/* 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();
@@ -4407,7 +4409,15 @@ static void NewSpriteSet(ByteReader *buf)
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(3)) {
+ /* 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;