diff options
| author | rubidium <rubidium@openttd.org> | 2007-06-18 22:09:54 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-06-18 22:09:54 +0000 |
| commit | fbb22487fc5757874b119f62ab8128314d6664ab (patch) | |
| tree | e0e169d58b91c15225839d4217e6cd10e081246c /src | |
| parent | 2ee73b50b8dae28f53acabcb5b7c0e3f02139db2 (diff) | |
| download | openttd-fbb22487fc5757874b119f62ab8128314d6664ab.tar.xz | |
(svn r10209) -Fix/Codechange: forgot a few changes of int32 -> Money in the previous commit
Diffstat (limited to 'src')
| -rw-r--r-- | src/economy.cpp | 2 | ||||
| -rw-r--r-- | src/economy.h | 6 | ||||
| -rw-r--r-- | src/variables.h | 2 |
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 { |