diff options
| -rw-r--r-- | src/clear_cmd.cpp | 17 | ||||
| -rw-r--r-- | src/economy.cpp | 8 | ||||
| -rw-r--r-- | src/openttd.h | 8 | ||||
| -rw-r--r-- | src/rail_cmd.cpp | 2 | ||||
| -rw-r--r-- | src/tree_cmd.cpp | 4 | ||||
| -rw-r--r-- | src/water_cmd.cpp | 2 |
6 files changed, 20 insertions, 21 deletions
diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp index a39bf24a6..2974aa04a 100644 --- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -438,20 +438,19 @@ CommandCost CmdPurchaseLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 MarkTileDirtyByTile(tile); } - return cost.AddCost(_price.purchase_land * 10); + return cost.AddCost(_price.clear_roughland * 10); } static CommandCost ClearTile_Clear(TileIndex tile, byte flags) { static const Money* clear_price_table[] = { - &_price.clear_1, - &_price.purchase_land, - &_price.clear_2, - &_price.clear_3, - &_price.purchase_land, - &_price.purchase_land, - &_price.clear_2, // XXX unused? + &_price.clear_grass, + &_price.clear_roughland, + &_price.clear_rocks, + &_price.clear_fields, + &_price.clear_roughland, + &_price.clear_roughland, }; CommandCost price; @@ -484,7 +483,7 @@ CommandCost CmdSellLandArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) DoClearSquare(tile); - return CommandCost(- _price.purchase_land * 2); + return CommandCost(- _price.clear_roughland * 2); } diff --git a/src/economy.cpp b/src/economy.cpp index 263ef5531..5b4f108c5 100644 --- a/src/economy.cpp +++ b/src/economy.cpp @@ -791,10 +791,10 @@ static const Money _price_base[NUM_PRICES] = { 65000, ///< ship_base 20, ///< build_trees 250, ///< terraform - 20, ///< clear_1 - 40, ///< purchase_land - 200, ///< clear_2 - 500, ///< clear_3 + 20, ///< clear_grass + 40, ///< clear_roughland + 200, ///< clear_rocks + 500, ///< clear_fields 20, ///< remove_trees -70, ///< remove_rail 10, ///< remove_signals diff --git a/src/openttd.h b/src/openttd.h index 79cfb5783..7a478655a 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -242,10 +242,10 @@ struct Prices { Money ship_base; Money build_trees; Money terraform; - Money clear_1; - Money purchase_land; - Money clear_2; - Money clear_3; + Money clear_grass; + Money clear_roughland; + Money clear_rocks; + Money clear_fields; Money remove_trees; Money remove_rail; Money remove_signals; diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 953c594cc..f73e6532f 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -419,7 +419,7 @@ CommandCost CmdBuildSingleRail(TileIndex tile, uint32 flags, uint32 p1, uint32 p if (water_ground) { cost.AddCost(-_price.clear_water); - cost.AddCost(_price.purchase_land); + cost.AddCost(_price.clear_roughland); } if (flags & DC_EXEC) { diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index 97fbb36b0..3b985965a 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -324,8 +324,8 @@ CommandCost CmdPlantTree(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) } switch (GetClearGround(tile)) { - case CLEAR_FIELDS: cost.AddCost(_price.clear_3); break; - case CLEAR_ROCKS: cost.AddCost(_price.clear_2); break; + case CLEAR_FIELDS: cost.AddCost(_price.clear_fields); break; + case CLEAR_ROCKS: cost.AddCost(_price.clear_rocks); break; default: break; } diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 550b85c47..664e3f5d8 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -357,7 +357,7 @@ static CommandCost ClearTile_Water(TileIndex tile, byte flags) if (slope == SLOPE_N || slope == SLOPE_E || slope == SLOPE_S || slope == SLOPE_W) { return CommandCost(_price.clear_water); } else { - return CommandCost(_price.purchase_land); + return CommandCost(_price.clear_roughland); } } |