diff --git a/economy.c b/economy.c --- a/economy.c +++ b/economy.c @@ -687,54 +687,54 @@ static byte _price_category[NUM_PRICES] }; static const int32 _price_base[NUM_PRICES] = { - 100, // station_value - 100, // build_rail - 95, // build_road - 65, // build_signals - 275, // build_bridge - 600, // build_train_depot - 500, // build_road_depot - 700, // build_ship_depot - 450, // build_tunnel - 200, // train_station_track - 180, // train_station_length - 600, // build_airport - 200, // build_bus_station - 200, // build_truck_station - 350, // build_dock - 400000, // build_railvehicle - 2000, // build_railwagon - 700000, // aircraft_base - 14000, // roadveh_base - 65000, // ship_base - 20, // build_trees - 250, // terraform - 20, // clear_1 - 40, // purchase_land - 200, // clear_2 - 500, // clear_3 - 20, // remove_trees - -70, // remove_rail - 10, // remove_signals - 50, // clear_bridge - 80, // remove_train_depot - 80, // remove_road_depot - 90, // remove_ship_depot - 30, // clear_tunnel - 10000, // clear_water - 50, // remove_rail_station - 30, // remove_airport - 50, // remove_bus_station - 50, // remove_truck_station - 55, // remove_dock - 1600, // remove_house - 40, // remove_road - 5600, // running_rail[0] railroad - 5200, // running_rail[1] monorail - 4800, // running_rail[2] maglev - 9600, // aircraft_running - 1600, // roadveh_running - 5600, // ship_running + 100, // station_value + 100, // build_rail + 95, // build_road + 65, // build_signals + 275, // build_bridge + 600, // build_train_depot + 500, // build_road_depot + 700, // build_ship_depot + 450, // build_tunnel + 200, // train_station_track + 180, // train_station_length + 600, // build_airport + 200, // build_bus_station + 200, // build_truck_station + 350, // build_dock + 400000, // build_railvehicle + 2000, // build_railwagon + 700000, // aircraft_base + 14000, // roadveh_base + 65000, // ship_base + 20, // build_trees + 250, // terraform + 20, // clear_1 + 40, // purchase_land + 200, // clear_2 + 500, // clear_3 + 20, // remove_trees + -70, // remove_rail + 10, // remove_signals + 50, // clear_bridge + 80, // remove_train_depot + 80, // remove_road_depot + 90, // remove_ship_depot + 30, // clear_tunnel + 10000, // clear_water + 50, // remove_rail_station + 30, // remove_airport + 50, // remove_bus_station + 50, // remove_truck_station + 55, // remove_dock + 1600, // remove_house + 40, // remove_road + 5600, // running_rail[0] railroad + 5200, // running_rail[1] monorail + 4800, // running_rail[2] maglev + 9600, // aircraft_running + 1600, // roadveh_running + 5600, // ship_running 1000000, // build_industry }; @@ -1040,12 +1040,12 @@ no_add:; } static const SaveLoad _subsidies_desc[] = { - SLE_VAR(Subsidy,cargo_type, SLE_UINT8), - SLE_VAR(Subsidy,age, SLE_UINT8), - SLE_CONDVAR(Subsidy,from, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), - SLE_CONDVAR(Subsidy,from, SLE_UINT16, 5, SL_MAX_VERSION), - SLE_CONDVAR(Subsidy,to, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), - SLE_CONDVAR(Subsidy,to, SLE_UINT16, 5, SL_MAX_VERSION), + SLE_VAR(Subsidy, cargo_type, SLE_UINT8), + SLE_VAR(Subsidy, age, SLE_UINT8), + SLE_CONDVAR(Subsidy, from, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), + SLE_CONDVAR(Subsidy, from, SLE_UINT16, 5, SL_MAX_VERSION), + SLE_CONDVAR(Subsidy, to, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), + SLE_CONDVAR(Subsidy, to, SLE_UINT16, 5, SL_MAX_VERSION), SLE_END() }; @@ -1635,24 +1635,24 @@ int32 CmdBuyCompany(TileIndex tile, uint // Prices static void SaveLoad_PRIC(void) { - SlArray(&_price, NUM_PRICES, SLE_INT32); + SlArray(&_price, NUM_PRICES, SLE_INT32); SlArray(&_price_frac, NUM_PRICES, SLE_UINT16); } // Cargo payment rates static void SaveLoad_CAPR(void) { - SlArray(&_cargo_payment_rates, NUM_CARGO, SLE_INT32); + SlArray(&_cargo_payment_rates, NUM_CARGO, SLE_INT32); SlArray(&_cargo_payment_rates_frac, NUM_CARGO, SLE_UINT16); } static const SaveLoad _economy_desc[] = { - SLE_VAR(Economy,max_loan, SLE_INT32), - SLE_VAR(Economy,max_loan_unround, SLE_INT32), - SLE_VAR(Economy,fluct, SLE_FILE_I16 | SLE_VAR_I32), - SLE_VAR(Economy,interest_rate, SLE_UINT8), - SLE_VAR(Economy,infl_amount, SLE_UINT8), - SLE_VAR(Economy,infl_amount_pr, SLE_UINT8), + SLE_VAR(Economy, max_loan, SLE_INT32), + SLE_VAR(Economy, max_loan_unround, SLE_INT32), + SLE_VAR(Economy, fluct, SLE_FILE_I16 | SLE_VAR_I32), + SLE_VAR(Economy, interest_rate, SLE_UINT8), + SLE_VAR(Economy, infl_amount, SLE_UINT8), + SLE_VAR(Economy, infl_amount_pr, SLE_UINT8), SLE_END() }; @@ -1665,6 +1665,6 @@ static void SaveLoad_ECMY(void) const ChunkHandler _economy_chunk_handlers[] = { { 'PRIC', SaveLoad_PRIC, SaveLoad_PRIC, CH_RIFF | CH_AUTO_LENGTH}, { 'CAPR', SaveLoad_CAPR, SaveLoad_CAPR, CH_RIFF | CH_AUTO_LENGTH}, - { 'SUBS', Save_SUBS, Load_SUBS, CH_ARRAY}, + { 'SUBS', Save_SUBS, Load_SUBS, CH_ARRAY}, { 'ECMY', SaveLoad_ECMY, SaveLoad_ECMY, CH_RIFF | CH_LAST}, };