Mercurial > hg > openttd
changeset 11394:c9c6f23ea1ac draft
(svn r15747) -Fix [FS#2736]: road ownership getting lost when removing a road stop.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 16 Mar 2009 20:45:32 +0000 |
| parents | 53442463c7c8 |
| children | 0aeecf04f948 |
| files | src/station_cmd.cpp |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -1632,6 +1632,8 @@ ((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 @@ * 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;