Mercurial > hg > openttd
changeset 1909:3791e0232e99 draft
(svn r2415) - Fix: [newgrf] Powered Wagons - Don't assume an undefined callback will fail.
author | hackykid <hackykid@openttd.org> |
---|---|
date | Mon, 06 Jun 2005 01:31:36 +0000 |
parents | acb434cd2e7e |
children | d0c1d704783c |
files | engine.h train_cmd.c |
diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/engine.h +++ b/engine.h @@ -144,6 +144,7 @@ // bit positions for rvi->callbackmask, indicates which callbacks are used by an engine // (some callbacks are always used, and dont appear here) enum CallbackMask { + CBM_WAGON_POWER = 0, CBM_REFIT_CAP = 3, };
--- a/train_cmd.c +++ b/train_cmd.c @@ -79,9 +79,10 @@ // 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; - - callback = GetCallBackResult(CBID_WAGON_POWER, u->engine_type, u); + uint16 callback = CALLBACK_FAILED; + + 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;