diff options
| author | rubidium <rubidium@openttd.org> | 2009-03-16 20:45:32 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-03-16 20:45:32 +0000 |
| commit | 72a9d62638ec8081b3c87b3d0ac7d7b48988dae3 (patch) | |
| tree | afd5f5bcdecf7a90f36b33ab689d364d1c0b6e62 | |
| parent | 1da742f010cfc37e0c311ca63f99886908ff0393 (diff) | |
| download | openttd-72a9d62638ec8081b3c87b3d0ac7d7b48988dae3.tar.xz | |
(svn r15747) -Fix [FS#2736]: road ownership getting lost when removing a road stop.
| -rw-r--r-- | src/station_cmd.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; |