From 7bbdd4f1196170b4abec8d5b1a2ccf6fad324d19 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 16 Mar 2009 20:45:32 +0000 Subject: (svn r15747) -Fix [FS#2736]: road ownership getting lost when removing a road stop. --- src/station_cmd.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 77ca29f54..2d97c2fd2 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1632,6 +1632,8 @@ CommandCost CmdRemoveRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, ui ((GetRoadStopDir(tile) == DIAGDIR_NE) ? ROAD_X : ROAD_Y) : DiagDirToRoadBits(GetRoadStopDir(tile)); + Owner road_owner = GetRoadOwner(tile, ROADTYPE_ROAD); + Owner tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM); CommandCost ret = RemoveRoadStop(st, flags, tile); /* If the stop was a drive-through stop replace the road */ @@ -1640,7 +1642,7 @@ CommandCost CmdRemoveRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, ui * removed by the owner of the roadstop, _current_company is the * owner of the road stop. */ MakeRoadNormal(tile, road_bits, rts, ClosestTownFromTile(tile, UINT_MAX)->index, - GetRoadOwner(tile, ROADTYPE_ROAD), GetRoadOwner(tile, ROADTYPE_TRAM)); + road_owner, tram_owner); } return ret; -- cgit v1.2.3-70-g09d2