diff options
| -rw-r--r-- | aircraft_cmd.c | 3 | ||||
| -rw-r--r-- | ship_cmd.c | 7 | ||||
| -rw-r--r-- | train_cmd.c | 7 |
3 files changed, 15 insertions, 2 deletions
diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 83cc43287..dc736e491 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -483,6 +483,7 @@ int32 CmdSendAircraftToHangar(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 * @param p1 vehicle ID of the aircraft to refit * @param p2 various bitstuffed elements * - p2 = (bit 0-7) - the new cargo type to refit to + * - p2 = (bit 8-15) - the new cargo subtype to refit to */ int32 CmdRefitAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { @@ -490,6 +491,7 @@ int32 CmdRefitAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) int pass, mail; int32 cost; CargoID new_cid = GB(p2, 0, 8); + byte new_subtype = GB(p2, 8, 8); const AircraftVehicleInfo *avi; if (!IsVehicleIndex(p1)) return CMD_ERROR; @@ -538,6 +540,7 @@ int32 CmdRefitAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) u->cargo_cap = mail; v->cargo_count = u->cargo_count = 0; v->cargo_type = new_cid; + v->cargo_subtype = new_subtype; InvalidateWindow(WC_VEHICLE_DETAILS, v->index); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); RebuildVehicleLists(); diff --git a/ship_cmd.c b/ship_cmd.c index e86aae54a..424d484fb 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -1030,12 +1030,14 @@ int32 CmdSendShipToDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) * @param p1 vehicle ID of the ship to refit * @param p2 various bitstuffed elements * - p2 = (bit 0-7) - the new cargo type to refit to (p2 & 0xFF) + * - p2 = (bit 8-15) - the new cargo subtype to refit to */ int32 CmdRefitShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { Vehicle *v; int32 cost; - CargoID new_cid = p2 & 0xFF; //gets the cargo number + CargoID new_cid = GB(p2, 0, 8); //gets the cargo number + byte new_subtype = GB(p2, 8, 8); if (!IsVehicleIndex(p1)) return CMD_ERROR; @@ -1061,7 +1063,10 @@ int32 CmdRefitShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) { v->cargo_count = 0; v->cargo_type = new_cid; + v->cargo_subtype = new_subtype; InvalidateWindow(WC_VEHICLE_DETAILS, v->index); + InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); + RebuildVehicleLists(); } return cost; diff --git a/train_cmd.c b/train_cmd.c index c801668d8..a189a9d9a 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1719,11 +1719,14 @@ int32 CmdForceTrainProceed(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) /** Refits a train to the specified cargo type. * @param tile unused * @param p1 vehicle ID of the train to refit - * @param p2 the new cargo type to refit to (p2 & 0xFF) + * param p2 various bitstuffed elements + * - p2 = (bit 0-7) - the new cargo type to refit to + * - p2 = (bit 8-15) - the new cargo subtype to refit to */ int32 CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { CargoID new_cid = GB(p2, 0, 8); + byte new_subtype = GB(p2, 8, 8); Vehicle *v; int32 cost; uint num; @@ -1789,8 +1792,10 @@ int32 CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) v->cargo_count = 0; v->cargo_type = new_cid; v->cargo_cap = amount; + v->cargo_subtype = new_subtype; InvalidateWindow(WC_VEHICLE_DETAILS, v->index); InvalidateWindow(WC_VEHICLE_DEPOT, v->tile); + RebuildVehicleLists(); } } } |