From 77d1dafa4fac329ee9f8ed2eaa9a2118e8396b24 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Fri, 31 Mar 2006 10:14:25 +0000 Subject: (svn r4198) - NewGRF: Rename GetCallBackResult() to GetVehicleCallback(), as other types will exist later, and use separate parameters instead of bitshifting. --- train_cmd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'train_cmd.c') diff --git a/train_cmd.c b/train_cmd.c index 4e433eef0..6ae53a21d 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -164,7 +164,7 @@ void TrainConsistChanged(Vehicle* v) CLRBIT(u->u.rail.flags, VRF_POWEREDWAGON); if ((rvi_v->pow_wag_power != 0) && (rvi_u->flags & RVI_WAGON) && UsesWagonOverride(u)) { if (HASBIT(rvi_u->callbackmask, CBM_WAGON_POWER)) { - uint16 callback = GetCallBackResult(CBID_TRAIN_WAGON_POWER, u->engine_type, u); + uint16 callback = GetVehicleCallback(CBID_TRAIN_WAGON_POWER, 0, 0, u->engine_type, u); if (callback != CALLBACK_FAILED) u->u.rail.cached_vis_effect = callback; @@ -191,7 +191,7 @@ void TrainConsistChanged(Vehicle* v) // check the vehicle length (callback) veh_len = CALLBACK_FAILED; if (HASBIT(rvi_u->callbackmask, CBM_VEHICLE_LENGTH)) - veh_len = GetCallBackResult(CBID_TRAIN_VEHICLE_LENGTH, u->engine_type, u); + veh_len = GetVehicleCallback(CBID_TRAIN_VEHICLE_LENGTH, 0, 0, u->engine_type, u); if (veh_len == CALLBACK_FAILED) veh_len = rvi_u->shorten_factor; veh_len = clamp(veh_len, 0, u->next == NULL ? 7 : 5); // the clamp on vehicles not the last in chain is stricter, as too short wagons can break the 'follow next vehicle' code @@ -485,7 +485,7 @@ static uint CountArticulatedParts(const RailVehicleInfo *rvi, EngineID engine_ty if (!HASBIT(rvi->callbackmask, CBM_ARTIC_ENGINE)) return 0; for (i = 1; i < 10; i++) { - callback = GetCallBackResult(CBID_TRAIN_ARTIC_ENGINE + (i << 8), engine_type, NULL); + callback = GetVehicleCallback(CBID_TRAIN_ARTIC_ENGINE, i, 0, engine_type, NULL); if (callback == CALLBACK_FAILED || callback == 0xFF) break; } @@ -505,7 +505,7 @@ static void AddArticulatedParts(const RailVehicleInfo *rvi, Vehicle **vl) if (!HASBIT(rvi->callbackmask, CBM_ARTIC_ENGINE)) return; for (i = 1; i < 10; i++) { - callback = GetCallBackResult(CBID_TRAIN_ARTIC_ENGINE + (i << 8), v->engine_type, NULL); + callback = GetVehicleCallback(CBID_TRAIN_ARTIC_ENGINE, i, 0, v->engine_type, NULL); if (callback == CALLBACK_FAILED || callback == 0xFF) return; u->next = vl[i]; @@ -1737,7 +1737,7 @@ int32 CmdRefitRailVehicle(int x, int y, uint32 flags, uint32 p1, uint32 p2) /* Check the 'refit capacity' callback */ CargoID temp_cid = v->cargo_type; v->cargo_type = new_cid; - amount = GetCallBackResult(CBID_VEHICLE_REFIT_CAPACITY, v->engine_type, v); + amount = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v); v->cargo_type = temp_cid; } -- cgit v1.2.3-54-g00ecf