summaryrefslogtreecommitdiff
path: root/src/newgrf.cpp
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2008-07-30 18:23:12 +0000
committerfrosch <frosch@openttd.org>2008-07-30 18:23:12 +0000
commitd54d8bf295fdc82580746a78c6feeb5e10d19047 (patch)
treee8219f143ce84fdcf02b32f82e184cc7e156023d /src/newgrf.cpp
parentd4774bdbab816a442f57c58fa0eb49e6fc35dc20 (diff)
downloadopenttd-d54d8bf295fdc82580746a78c6feeb5e10d19047.tar.xz
(svn r13885) -Fix [FS#2168]: Var 0x7F is not feature-specific.
Diffstat (limited to 'src/newgrf.cpp')
-rw-r--r--src/newgrf.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index b1dd7b620..6ae310600 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -1732,7 +1732,7 @@ static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int le
case 0x08: /* Bit number of cargo */
cs->bitnum = grf_load_byte(&buf);
if (cs->IsValid()) {
- cs->grfid = _cur_grffile->grfid;
+ cs->grffile = _cur_grffile;
SetBit(_cargo_mask, cid + i);
} else {
ClrBit(_cargo_mask, cid + i);
@@ -3045,6 +3045,7 @@ static void CanalMapSpriteGroup(byte *buf, uint8 idcount)
continue;
}
+ _water_feature[cf].grffile = _cur_grffile;
_water_feature[cf].group = _cur_grffile->spritegroups[groupid];
}
}
@@ -3198,7 +3199,7 @@ static void CargoMapSpriteGroup(byte *buf, uint8 idcount)
}
CargoSpec *cs = &_cargo[cid];
- cs->grfid = _cur_grffile->grfid;
+ cs->grffile = _cur_grffile;
cs->group = _cur_grffile->spritegroups[groupid];
}
}