(svn r7665) -Backport from trunk (r7547): 0.5
authorDarkvater
Sat, 30 Dec 2006 23:03:15 +0000
branch0.5
changeset 5364 84ee8990e824
parent 5363 fe172941ea9e
child 5365 81e1c8f97973
(svn r7665) -Backport from trunk (r7547):
- When removing a rail station, the cost was added for the full rectangle not for
only the removed tiles themselves.
station_cmd.c
--- a/station_cmd.c	Sat Dec 30 23:00:52 2006 +0000
+++ b/station_cmd.c	Sat Dec 30 23:03:15 2006 +0000
@@ -1291,7 +1291,7 @@
 static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
 {
 	int w,h;
-	int32 cost;
+	int32 cost = 0;
 
 	/* if there is flooding and non-uniform stations are enabled, remove platforms tile by tile */
 	if (_current_player == OWNER_WATER && _patches.nonuniform_stations)
@@ -1308,9 +1308,6 @@
 
 	assert(w != 0 && h != 0);
 
-	/* cost is area * constant */
-	cost = w*h*_price.remove_rail_station;
-
 	/* clear all areas of the station */
 	do {
 		int w_bak = w;
@@ -1319,6 +1316,7 @@
 			if (TileBelongsToRailStation(st, tile)) {
 				if (!EnsureNoVehicle(tile))
 					return CMD_ERROR;
+				cost += _price.remove_rail_station;
 				if (flags & DC_EXEC) {
 					Track track = GetRailStationTrack(tile);
 					DoClearSquare(tile);