From 0107562a8603960daf8eac2084b17b7b563abbd0 Mon Sep 17 00:00:00 2001 From: terkhen Date: Sun, 25 Apr 2010 20:56:42 +0000 Subject: [PATCH] (svn r19727) -Fix (r19720) [FS#3795]: Demolishing bridges or aqueducts caused a crash. --- src/tunnelbridge_cmd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 5ffce3ad5e..5823ff6794 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -750,6 +750,8 @@ static CommandCost DoClearBridge(TileIndex tile, DoCommandFlag flags) ChangeTownRating(t, RATING_TUNNEL_BRIDGE_DOWN_STEP, RATING_TUNNEL_BRIDGE_MINIMUM, flags); } + Money base_cost = (GetTunnelBridgeTransportType(tile) != TRANSPORT_WATER) ? _price[PR_CLEAR_BRIDGE] : _price[PR_CLEAR_AQUEDUCT]; + if (flags & DC_EXEC) { /* read this value before actual removal of bridge */ bool rail = GetTunnelBridgeTransportType(tile) == TRANSPORT_RAIL; @@ -787,7 +789,6 @@ static CommandCost DoClearBridge(TileIndex tile, DoCommandFlag flags) } } - Money base_cost = (GetTunnelBridgeTransportType(tile) != TRANSPORT_WATER) ? _price[PR_CLEAR_BRIDGE] : _price[PR_CLEAR_AQUEDUCT]; return CommandCost(EXPENSES_CONSTRUCTION, (GetTunnelBridgeLength(tile, endtile) + 2) * base_cost); }