summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglx <glx@openttd.org>2007-11-16 02:25:56 +0000
committerglx <glx@openttd.org>2007-11-16 02:25:56 +0000
commitbad3d28184f716a67042165a140b3596249a8c5b (patch)
tree8aeb4b258903437a0a3d636fd2a0b1971720b17e
parentfbd234d2744b84151037b870c807317dd3b2c704 (diff)
downloadopenttd-bad3d28184f716a67042165a140b3596249a8c5b.tar.xz
(svn r11443) -Fix: [NewGRF] Action 0 <id> is an extended byte
-rw-r--r--src/newgrf.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 5a0d9098b..8e48bc1dd 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2077,7 +2077,7 @@ static void FeatureChangeInfo(byte *buf, int len)
* 4 for defining new train station sets
* B num-props how many properties to change per vehicle/station
* B num-info how many vehicles/stations to change
- * B id ID of first vehicle/station to change, if num-info is
+ * E id ID of first vehicle/station to change, if num-info is
* greater than one, this one and the following
* vehicles/stations will be changed
* B property what property to change, depends on the feature
@@ -2105,7 +2105,7 @@ static void FeatureChangeInfo(byte *buf, int len)
uint8 feature = grf_load_byte(&buf);
uint8 numprops = grf_load_byte(&buf);
uint numinfo = grf_load_byte(&buf);
- uint engine = grf_load_byte(&buf);
+ uint engine = grf_load_extended(&buf);
grfmsg(6, "FeatureChangeInfo: feature %d, %d properties, to apply to %d+%d",
feature, numprops, engine, numinfo);
@@ -2192,8 +2192,8 @@ static void SafeChangeInfo(byte *buf, int len)
buf++;
uint8 feature = grf_load_byte(&buf);
uint8 numprops = grf_load_byte(&buf);
- grf_load_byte(&buf);
- grf_load_byte(&buf);
+ grf_load_byte(&buf); // num-info
+ grf_load_extended(&buf); // id
if (feature == GSF_BRIDGE && numprops == 1) {
uint8 prop = grf_load_byte(&buf);
@@ -2218,7 +2218,7 @@ static void InitChangeInfo(byte *buf, int len)
uint8 feature = grf_load_byte(&buf);
uint8 numprops = grf_load_byte(&buf);
uint8 numinfo = grf_load_byte(&buf);
- uint8 index = grf_load_byte(&buf);
+ uint8 index = grf_load_extended(&buf);
while (numprops-- && buf < bufend) {
uint8 prop = grf_load_byte(&buf);
@@ -2260,7 +2260,7 @@ static void ReserveChangeInfo(byte *buf, int len)
uint8 numprops = grf_load_byte(&buf);
uint8 numinfo = grf_load_byte(&buf);
- uint8 index = grf_load_byte(&buf);
+ uint8 index = grf_load_extended(&buf);
while (numprops-- && buf < bufend) {
uint8 prop = grf_load_byte(&buf);