Fix #8064: Incorrect display of refit capacity

pull/140/head
glx 4 years ago committed by Charles Pigott
parent 7fe291667f
commit b50d77b831

@ -169,7 +169,7 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine)
* @param cargo_type Selected refitted cargo type * @param cargo_type Selected refitted cargo type
* @param cargo_capacity Capacity of selected refitted cargo type * @param cargo_capacity Capacity of selected refitted cargo type
*/ */
void GetArticulatedVehicleCargoesAndRefits(EngineID engine, CargoArray *cargoes, CargoTypes *refits, CargoID cargo_type, uint16 cargo_capacity) void GetArticulatedVehicleCargoesAndRefits(EngineID engine, CargoArray *cargoes, CargoTypes *refits, CargoID cargo_type, uint cargo_capacity)
{ {
cargoes->Clear(); cargoes->Clear();
*refits = 0; *refits = 0;

@ -24,7 +24,7 @@ extern const uint8 _engine_offsets[4];
bool IsEngineBuildable(EngineID engine, VehicleType type, CompanyID company); bool IsEngineBuildable(EngineID engine, VehicleType type, CompanyID company);
bool IsEngineRefittable(EngineID engine); bool IsEngineRefittable(EngineID engine);
void GetArticulatedVehicleCargoesAndRefits(EngineID engine, CargoArray *cargoes, CargoTypes *refits, CargoID cargo_type, uint16 cargo_capacity); void GetArticulatedVehicleCargoesAndRefits(EngineID engine, CargoArray *cargoes, CargoTypes *refits, CargoID cargo_type, uint cargo_capacity);
void SetYearEngineAgingStops(); void SetYearEngineAgingStops();
void StartupOneEngine(Engine *e, Date aging_date); void StartupOneEngine(Engine *e, Date aging_date);

@ -82,7 +82,7 @@ static const uint GEN_HASHX_MASK = (1 << GEN_HASHX_BITS) - 1;
static const uint GEN_HASHY_MASK = ((1 << GEN_HASHY_BITS) - 1) << GEN_HASHX_BITS; static const uint GEN_HASHY_MASK = ((1 << GEN_HASHY_BITS) - 1) << GEN_HASHX_BITS;
VehicleID _new_vehicle_id; VehicleID _new_vehicle_id;
uint16 _returned_refit_capacity; ///< Stores the capacity after a refit operation. uint _returned_refit_capacity; ///< Stores the capacity after a refit operation.
uint16 _returned_mail_refit_capacity; ///< Stores the mail capacity after a refit operation (Aircraft only). uint16 _returned_mail_refit_capacity; ///< Stores the mail capacity after a refit operation (Aircraft only).

@ -165,7 +165,7 @@ CommandCost EnsureNoVehicleOnGround(TileIndex tile);
CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits); CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits);
extern VehicleID _new_vehicle_id; extern VehicleID _new_vehicle_id;
extern uint16 _returned_refit_capacity; extern uint _returned_refit_capacity;
extern uint16 _returned_mail_refit_capacity; extern uint16 _returned_mail_refit_capacity;
bool CanVehicleUseStation(EngineID engine_type, const struct Station *st); bool CanVehicleUseStation(EngineID engine_type, const struct Station *st);

@ -39,7 +39,7 @@ enum VehicleInvalidateWindowData {
struct TestedEngineDetails { struct TestedEngineDetails {
Money cost; ///< Refit cost Money cost; ///< Refit cost
CargoID cargo; ///< Cargo type CargoID cargo; ///< Cargo type
uint16 capacity; ///< Cargo capacity uint capacity; ///< Cargo capacity
uint16 mail_capacity; ///< Mail capacity if available uint16 mail_capacity; ///< Mail capacity if available
}; };

Loading…
Cancel
Save