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

(svn r17443) -Fix (r17442): clear the depot tile after removing the depot in all cases instead of only for ships; makes removing road/rail depots not crash :)

release/1.0
rubidium 2009-09-07 08:35:45 +00:00
parent 6593e4490a
commit 130781102e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rail_cmd.cpp
View File

@ -1442,8 +1442,8 @@ static CommandCost RemoveTrainDepot(TileIndex tile, DoCommandFlag flags)
if (v != NULL) FreeTrainTrackReservation(v); if (v != NULL) FreeTrainTrackReservation(v);
} }
DoClearSquare(tile);
delete Depot::GetByTile(tile); delete Depot::GetByTile(tile);
DoClearSquare(tile);
AddSideToSignalBuffer(tile, dir, owner); AddSideToSignalBuffer(tile, dir, owner);
YapfNotifyTrackLayoutChange(tile, DiagDirToDiagTrack(dir)); YapfNotifyTrackLayoutChange(tile, DiagDirToDiagTrack(dir));
if (v != NULL) TryPathReserve(v, true); if (v != NULL) TryPathReserve(v, true);

2
src/road_cmd.cpp
View File

@ -895,8 +895,8 @@ static CommandCost RemoveRoadDepot(TileIndex tile, DoCommandFlag flags)
if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
DoClearSquare(tile);
delete Depot::GetByTile(tile); delete Depot::GetByTile(tile);
DoClearSquare(tile);
} }
return CommandCost(EXPENSES_CONSTRUCTION, _price.remove_road_depot); return CommandCost(EXPENSES_CONSTRUCTION, _price.remove_road_depot);