Mercurial > hg > openttd
changeset 6734:078d8129a184 draft
(svn r9966) -Fix: bridges and tunnels were not always removed on bankruptcy, thus leaving tunnels/bridges with an invalid owner that would crash the game when clicking with the query tool on them.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 28 May 2007 21:32:26 +0000 |
| parents | 84f67d7e1b86 |
| children | 8420208013c0 |
| files | src/tunnelbridge_cmd.cpp |
| diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -1325,7 +1325,14 @@ if (new_player != PLAYER_SPECTATOR) { SetTileOwner(tile, new_player); } else { - DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); + if (CmdFailed(DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR))) { + /* When clearing the bridge/tunnel failed there are still vehicles on/in + * the bridge/tunnel. As all *our* vehicles are already removed, they + * must be of another owner. Therefor this must be a road bridge/tunnel. + * In that case we can safely reassign the ownership to OWNER_NONE. */ + assert((IsTunnel(tile) ? GetTunnelTransportType(tile) : GetBridgeTransportType(tile)) == TRANSPORT_ROAD); + SetTileOwner(tile, OWNER_NONE); + } } }