summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/economy.cpp2
-rw-r--r--src/economy.h6
-rw-r--r--src/variables.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/economy.cpp b/src/economy.cpp
index 47e1ebebe..078d153d6 100644
--- a/src/economy.cpp
+++ b/src/economy.cpp
@@ -1157,7 +1157,7 @@ static void Load_SUBS()
SlObject(&_subsidies[index], _subsidies_desc);
}
-int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type)
+Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type)
{
const CargoSpec *cs = GetCargo(cargo_type);
byte f;
diff --git a/src/economy.h b/src/economy.h
index 504dae3e1..7dd55b9fe 100644
--- a/src/economy.h
+++ b/src/economy.h
@@ -9,8 +9,8 @@ void ResetPriceBaseMultipliers();
void SetPriceBaseMultiplier(uint price, byte factor);
struct Economy {
- int32 max_loan; ///< Maximum possible loan
- int32 max_loan_unround; ///< Economy fluctuation status
+ Money max_loan; ///< Maximum possible loan
+ Money max_loan_unround; ///< Economy fluctuation status
int fluct;
byte interest_rate; ///< Interest
byte infl_amount; ///< inflation amount
@@ -65,7 +65,7 @@ void DeleteSubsidyWithTown(TownID index);
void DeleteSubsidyWithIndustry(IndustryID index);
void DeleteSubsidyWithStation(StationID index);
-int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type);
+Money GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, CargoID cargo_type);
uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount);
void VehiclePayment(Vehicle *front_v);
diff --git a/src/variables.h b/src/variables.h
index a43d9d1f3..4277f5111 100644
--- a/src/variables.h
+++ b/src/variables.h
@@ -18,7 +18,7 @@
VARDEF Prices _price;
VARDEF uint16 _price_frac[NUM_PRICES];
-VARDEF uint32 _cargo_payment_rates[NUM_CARGO];
+VARDEF Money _cargo_payment_rates[NUM_CARGO];
VARDEF uint16 _cargo_payment_rates_frac[NUM_CARGO];
struct GameOptions {