From 130781102e2627adb3b8709d878f45b6ddfa7cab Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 7 Sep 2009 08:35:45 +0000 Subject: (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 :) --- src/rail_cmd.cpp | 2 +- src/road_cmd.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 24792baab..ba288b946 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -1442,8 +1442,8 @@ static CommandCost RemoveTrainDepot(TileIndex tile, DoCommandFlag flags) if (v != NULL) FreeTrainTrackReservation(v); } - DoClearSquare(tile); delete Depot::GetByTile(tile); + DoClearSquare(tile); AddSideToSignalBuffer(tile, dir, owner); YapfNotifyTrackLayoutChange(tile, DiagDirToDiagTrack(dir)); if (v != NULL) TryPathReserve(v, true); diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 754d6fd97..d3c865e35 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -895,8 +895,8 @@ static CommandCost RemoveRoadDepot(TileIndex tile, DoCommandFlag flags) if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR; if (flags & DC_EXEC) { - DoClearSquare(tile); delete Depot::GetByTile(tile); + DoClearSquare(tile); } return CommandCost(EXPENSES_CONSTRUCTION, _price.remove_road_depot); -- cgit v1.2.3-54-g00ecf