diff options
| author | hackykid <hackykid@openttd.org> | 2005-06-06 01:31:36 +0000 |
|---|---|---|
| committer | hackykid <hackykid@openttd.org> | 2005-06-06 01:31:36 +0000 |
| commit | 2fbb96bfa5cb10baab827b0d71539721f1619324 (patch) | |
| tree | 88fc075d2f739ad04b138651f1f43d8bd6bdb2aa /train_cmd.c | |
| parent | 1018d3b78670be09d0d6ffbb2633b715c0203146 (diff) | |
| download | openttd-2fbb96bfa5cb10baab827b0d71539721f1619324.tar.xz | |
(svn r2415) - Fix: [newgrf] Powered Wagons - Don't assume an undefined callback will fail.
Diffstat (limited to 'train_cmd.c')
| -rw-r--r-- | train_cmd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/train_cmd.c b/train_cmd.c index d75f58584..0096e43b4 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -79,9 +79,10 @@ void TrainConsistChanged(Vehicle *v) { // check if its a powered wagon CLRBIT(u->u.rail.flags, VRF_POWEREDWAGON); if ((rvi_v->pow_wag_power != 0) && (rvi_u->flags & RVI_WAGON) && UsesWagonOverride(u)) { - uint16 callback; + uint16 callback = CALLBACK_FAILED; - callback = GetCallBackResult(CBID_WAGON_POWER, u->engine_type, u); + if (HASBIT(rvi_u->callbackmask, CBM_WAGON_POWER)) + callback = GetCallBackResult(CBID_WAGON_POWER, u->engine_type, u); if (callback == CALLBACK_FAILED) callback = rvi_u->visual_effect; |