mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r10209) -Fix/Codechange: forgot a few changes of int32 -> Money in the previous commit

release/0.6
rubidium 2007-06-18 22:09:54 +00:00
parent 2ee73b50b8
commit fbb22487fc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/economy.cpp
View File

@ -1157,7 +1157,7 @@ static void Load_SUBS()
SlObject(&_subsidies[index], _subsidies_desc); 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); const CargoSpec *cs = GetCargo(cargo_type);
byte f; byte f;

6
src/economy.h
View File

@ -9,8 +9,8 @@ void ResetPriceBaseMultipliers();
void SetPriceBaseMultiplier(uint price, byte factor); void SetPriceBaseMultiplier(uint price, byte factor);
struct Economy { struct Economy {
int32 max_loan; ///< Maximum possible loan Money max_loan; ///< Maximum possible loan
int32 max_loan_unround; ///< Economy fluctuation status Money max_loan_unround; ///< Economy fluctuation status
int fluct; int fluct;
byte interest_rate; ///< Interest byte interest_rate; ///< Interest
byte infl_amount; ///< inflation amount byte infl_amount; ///< inflation amount
@ -65,7 +65,7 @@ void DeleteSubsidyWithTown(TownID index);
void DeleteSubsidyWithIndustry(IndustryID index); void DeleteSubsidyWithIndustry(IndustryID index);
void DeleteSubsidyWithStation(StationID 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); uint MoveGoodsToStation(TileIndex tile, int w, int h, CargoID type, uint amount);
void VehiclePayment(Vehicle *front_v); void VehiclePayment(Vehicle *front_v);

2
src/variables.h
View File

@ -18,7 +18,7 @@
VARDEF Prices _price; VARDEF Prices _price;
VARDEF uint16 _price_frac[NUM_PRICES]; 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]; VARDEF uint16 _cargo_payment_rates_frac[NUM_CARGO];
struct GameOptions { struct GameOptions {