mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r11634) -Fix: update signals when deleting crashed train on a bridge, update even when train is rotated

This commit is contained in:
smatz 2007-12-15 00:04:01 +00:00
parent 4b7f8f04a3
commit 5992187a85
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/train_cmd.cpp
View File

@ -3030,7 +3030,7 @@ reverse_train_direction:
* Deletes/Clears the last wagon of a crashed train. It takes the engine of the * Deletes/Clears the last wagon of a crashed train. It takes the engine of the
* train, then goes to the last wagon and deletes that. Each call to this function * train, then goes to the last wagon and deletes that. Each call to this function
* will remove the last wagon of a crashed train. If this wagon was on a crossing, * will remove the last wagon of a crashed train. If this wagon was on a crossing,
* or inside a tunnel, recalculate the signals as they might need updating * or inside a tunnel/bridge, recalculate the signals as they might need updating
* @param v the Vehicle of which last wagon is to be removed * @param v the Vehicle of which last wagon is to be removed
*/ */
static void DeleteLastWagon(Vehicle *v) static void DeleteLastWagon(Vehicle *v)
@ -3059,27 +3059,16 @@ static void DeleteLastWagon(Vehicle *v)
* others are on it */ * others are on it */
DisableTrainCrossing(v->tile); DisableTrainCrossing(v->tile);
if ((v->u.rail.track == TRACK_BIT_WORMHOLE && v->vehstatus & VS_HIDDEN)) { // inside a tunnel if (v->u.rail.track == TRACK_BIT_WORMHOLE) { // inside a tunnel / bridge
TileIndex endtile = GetOtherTunnelEnd(v->tile); TileIndex endtile = IsTunnel(v->tile) ? GetOtherTunnelEnd(v->tile) : GetOtherBridgeEnd(v->tile);
if (GetVehicleTunnelBridge(v->tile, endtile) != NULL) return; // tunnel is busy (error returned) if (GetVehicleTunnelBridge(v->tile, endtile) != NULL) return; // tunnel / bridge is busy
switch (v->direction) { DiagDirection dir = IsTunnel(v->tile) ? GetTunnelDirection(v->tile) : GetBridgeRampDirection(v->tile);
case 1:
case 5:
SetSignalsOnBothDir(v->tile, 0);
SetSignalsOnBothDir(endtile, 0);
break;
case 3: /* v->direction is "random", so it cannot be used to determine the direction of the track */
case 7: UpdateSignalsOnSegment(v->tile, dir);
SetSignalsOnBothDir(v->tile, 1); UpdateSignalsOnSegment(endtile, ReverseDiagDir(dir));
SetSignalsOnBothDir(endtile, 1);
break;
default:
break;
}
} }
} }