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

(svn r9965) -Fix: the ownership of drive through road stops on town owned roads wasn't properly reset when the road stop was removed.

release/0.6
rubidium 2007-05-28 20:46:59 +00:00
parent 66c23060e2
commit c5d073a84f
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/station_cmd.cpp
View File

@ -1438,20 +1438,11 @@ int32 CmdRemoveRoadStop(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
/* If the stop was a drive-through stop replace the road */ /* If the stop was a drive-through stop replace the road */
if ((flags & DC_EXEC) && !CmdFailed(ret) && is_drive_through) { if ((flags & DC_EXEC) && !CmdFailed(ret) && is_drive_through) {
uint index = 0; /* Rebuild the drive throuhg road stop. As a road stop can only be
Owner cur_owner = _current_player; * removed by the owner of the roadstop, _current_player is the
* owner of the road stop. */
if (is_towns_road) { MakeRoadNormal(tile, road_bits, rts, is_towns_road ? ClosestTownFromTile(tile, (uint)-1)->index : 0,
index = ClosestTownFromTile(tile, (uint)-1)->index; is_towns_road ? OWNER_TOWN : _current_player, _current_player, _current_player);
_current_player = OWNER_TOWN;
}
if (HASBIT(rts, ROADTYPE_ROAD)) {
DoCommand(tile, ROADTYPE_ROAD << 4 | road_bits, index, DC_EXEC, CMD_BUILD_ROAD);
}
if (HASBIT(rts, ROADTYPE_TRAM)) {
DoCommand(tile, ROADTYPE_TRAM << 4 | road_bits, index, DC_EXEC, CMD_BUILD_ROAD);
}
_current_player = cur_owner;
} }
return ret; return ret;