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

(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.
release/0.5
Darkvater 2006-12-30 23:03:15 +00:00
parent 652e834ee7
commit d4b335fffb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
station_cmd.c
View File

@ -1291,7 +1291,7 @@ uint GetPlatformLength(TileIndex tile, DiagDirection dir)
static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags) static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
{ {
int w,h; int w,h;
int32 cost; int32 cost = 0;
/* if there is flooding and non-uniform stations are enabled, remove platforms tile by tile */ /* if there is flooding and non-uniform stations are enabled, remove platforms tile by tile */
if (_current_player == OWNER_WATER && _patches.nonuniform_stations) if (_current_player == OWNER_WATER && _patches.nonuniform_stations)
@ -1308,9 +1308,6 @@ static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
assert(w != 0 && h != 0); assert(w != 0 && h != 0);
/* cost is area * constant */
cost = w*h*_price.remove_rail_station;
/* clear all areas of the station */ /* clear all areas of the station */
do { do {
int w_bak = w; int w_bak = w;
@ -1319,6 +1316,7 @@ static int32 RemoveRailroadStation(Station *st, TileIndex tile, uint32 flags)
if (TileBelongsToRailStation(st, tile)) { if (TileBelongsToRailStation(st, tile)) {
if (!EnsureNoVehicle(tile)) if (!EnsureNoVehicle(tile))
return CMD_ERROR; return CMD_ERROR;
cost += _price.remove_rail_station;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
Track track = GetRailStationTrack(tile); Track track = GetRailStationTrack(tile);
DoClearSquare(tile); DoClearSquare(tile);