From b50d77b831c60f9f162a6f1d2bc9ca19e702784e Mon Sep 17 00:00:00 2001
From: glx <glx@openttd.org>
Date: Mon, 6 Apr 2020 16:39:58 +0200
Subject: [PATCH] Fix #8064: Incorrect display of refit capacity
---
src/articulated_vehicles.cpp | 2 +-
src/engine_func.h | 2 +-
src/vehicle.cpp | 2 +-
src/vehicle_func.h | 2 +-
src/vehicle_gui.h | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/articulated_vehicles.cpp b/src/articulated_vehicles.cpp
index 7e828bf439..4f42c6955c 100644
--- a/src/articulated_vehicles.cpp
+++ b/src/articulated_vehicles.cpp
@@ -169,7 +169,7 @@ CargoArray GetCapacityOfArticulatedParts(EngineID engine)
* @param cargo_type 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();
*refits = 0;
diff --git a/src/engine_func.h b/src/engine_func.h
index 472600cf77..97bfd0894b 100644
--- a/src/engine_func.h
+++ b/src/engine_func.h
@@ -24,7 +24,7 @@ extern const uint8 _engine_offsets[4];
bool IsEngineBuildable(EngineID engine, VehicleType type, CompanyID company);
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 StartupOneEngine(Engine *e, Date aging_date);
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 2c57d970de..ae5af64a1a 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -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;
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).
diff --git a/src/vehicle_func.h b/src/vehicle_func.h
index aa8334ebb0..ec14e526af 100644
--- a/src/vehicle_func.h
+++ b/src/vehicle_func.h
@@ -165,7 +165,7 @@ CommandCost EnsureNoVehicleOnGround(TileIndex tile);
CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits);
extern VehicleID _new_vehicle_id;
-extern uint16 _returned_refit_capacity;
+extern uint _returned_refit_capacity;
extern uint16 _returned_mail_refit_capacity;
bool CanVehicleUseStation(EngineID engine_type, const struct Station *st);
diff --git a/src/vehicle_gui.h b/src/vehicle_gui.h
index fe21325168..50cbdc4bc8 100644
--- a/src/vehicle_gui.h
+++ b/src/vehicle_gui.h
@@ -39,7 +39,7 @@ enum VehicleInvalidateWindowData {
struct TestedEngineDetails {
Money cost; ///< Refit cost
CargoID cargo; ///< Cargo type
- uint16 capacity; ///< Cargo capacity
+ uint capacity; ///< Cargo capacity
uint16 mail_capacity; ///< Mail capacity if available
};