cpp/openttd-patchpack/source Changeset - r7977:07394fa369f3

Changeset - r7977:07394fa369f3

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

belugas - 17 years ago 2007-11-27 16:02:13
belugas@openttd.org

(svn r11533) -Codechange: Rename some unclear clear_x prices member names.
While at it, remove one unused entry on the clear_price_table array.
It is based on ground type, and the unused one was referencing a non existing one.

6 files changed with 20 insertions and 21 deletions:

src/clear_cmd.cpp

src/economy.cpp

src/openttd.h

src/rail_cmd.cpp

src/tree_cmd.cpp

src/water_cmd.cpp

0 comments (0 inline, 0 general)

src/clear_cmd.cpp

➞

Show inline comments

@@ @@ -438,20 +438,19 @@ CommandCost CmdPurchaseLandArea(TileInde @@
 		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 ti @@
 	if (flags & DC_EXEC) DoClearSquare(tile);
-	return CommandCost(- _price.purchase_land * 2);
+	return CommandCost(- _price.clear_roughland * 2);
+}

src/economy.cpp

➞

Show inline comments

@@ @@ -791,10 +791,10 @@ static const Money _price_base[NUM_PRICE @@
 , ///< ship_base
 , ///< build_trees
 , ///< terraform
 , ///< clear_1
 , ///< purchase_land
 , ///< clear_2
 , ///< clear_3
 , ///< clear_grass
 , ///< clear_roughland
 , ///< clear_rocks
 , ///< clear_fields
 , ///< remove_trees
 	    -70, ///< remove_rail
 , ///< remove_signals

src/openttd.h

➞

Show inline comments

@@ @@ -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;

src/rail_cmd.cpp

➞

Show inline comments

@@ @@ -419,7 +419,7 @@ CommandCost CmdBuildSingleRail(TileIndex @@
 			if (water_ground) {
 				cost.AddCost(-_price.clear_water);
-				cost.AddCost(_price.purchase_land);
+				cost.AddCost(_price.clear_roughland);
+			}
 			if (flags & DC_EXEC) {

src/tree_cmd.cpp

➞

Show inline comments

@@ @@ -324,8 +324,8 @@ CommandCost CmdPlantTree(TileIndex tile, @@
+					}
 					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;
+					}

src/water_cmd.cpp

➞

Show inline comments

@@ @@ -357,7 +357,7 @@ static CommandCost ClearTile_Water(TileI @@
 			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);
+			}
+		}

0 comments (0 inline, 0 general)