--- a/src/economy.cpp	Mon Jun 18 21:44:47 2007 +0000
+++ b/src/economy.cpp	Mon Jun 18 22:09:54 2007 +0000
@@ -1157,7 +1157,7 @@
 		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;

--- a/src/economy.h	Mon Jun 18 21:44:47 2007 +0000
+++ b/src/economy.h	Mon Jun 18 22:09:54 2007 +0000
@@ -9,8 +9,8 @@
 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 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);

--- a/src/variables.h	Mon Jun 18 21:44:47 2007 +0000
+++ b/src/variables.h	Mon Jun 18 22:09:54 2007 +0000
@@ -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 {