From d6ebfb8338dcd1d7c5a9543068c43c60dfc60601 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Fri, 9 Jun 2006 07:03:53 +0000 Subject: (svn r5187) - NewGRF: temporarily change a vehicle's cargo subtype when calling the refit capacity callback. --- aircraft_cmd.c | 3 +++ train_cmd.c | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 9a3306c3d..28b7eecdc 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -564,12 +564,15 @@ int32 CmdRefitAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_REFIT_CAPACITY)) { /* Back up the existing cargo type */ CargoID temp_cid = v->cargo_type; + byte temp_subtype = v->cargo_subtype; v->cargo_type = new_cid; + v->cargo_subtype = new_subtype; callback = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v); /* Restore the cargo type */ v->cargo_type = temp_cid; + v->cargo_subtype = temp_subtype; } if (callback == CALLBACK_FAILED) { diff --git a/train_cmd.c b/train_cmd.c index 90b6cb224..bf8b29629 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1760,11 +1760,16 @@ int32 CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) uint16 amount = CALLBACK_FAILED; if (HASBIT(EngInfo(v->engine_type)->callbackmask, CBM_REFIT_CAPACITY)) { - /* Check the 'refit capacity' callback */ + /* Back up the vehicle's cargo type */ CargoID temp_cid = v->cargo_type; + byte temp_subtype = v->cargo_subtype; v->cargo_type = new_cid; + v->cargo_subtype = new_subtype; + /* Check the refit capacity callback */ amount = GetVehicleCallback(CBID_VEHICLE_REFIT_CAPACITY, 0, 0, v->engine_type, v); + /* Restore the original cargo type */ v->cargo_type = temp_cid; + v->cargo_subtype = temp_subtype; } if (amount == CALLBACK_FAILED) { // callback failed or not used, use default -- cgit v1.2.3-70-g09d2