dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r11760) -Codechange: unify the way how other end of a tunnel/bridge is determined at some places

Browse Source 
-Fix: adding road/tram to tram/road bridge was cheaper by one tile
This commit is contained in:
smatz
2008-01-04 19:45:29 +00:00
parent 9299f76af4
commit 7302d8c88b
6 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/train_cmd.cpp
View File

@@ -2851,11 +2851,7 @@ static void CheckTrainCollision(Vehicle *v)
/* find colliding vehicles */
if (v->u.rail.track == TRACK_BIT_WORMHOLE) {
VehicleFromPos(v->tile, &tcc, FindTrainCollideEnum);
if (IsBridgeTile(v->tile)) {
VehicleFromPos(GetOtherBridgeEnd(v->tile), &tcc, FindTrainCollideEnum);
} else {
VehicleFromPos(GetOtherTunnelEnd(v->tile), &tcc, FindTrainCollideEnum);
}
VehicleFromPos(GetOtherTunnelBridgeEnd(v->tile), &tcc, FindTrainCollideEnum);
} else {
VehicleFromPosXY(v->x_pos, v->y_pos, &tcc, FindTrainCollideEnum);
}
@@ -3130,7 +3126,7 @@ static void DeleteLastWagon(Vehicle *v)
DisableTrainCrossing(v->tile);
if (v->u.rail.track == TRACK_BIT_WORMHOLE) { // inside a tunnel / bridge
TileIndex endtile = IsTunnel(v->tile) ? GetOtherTunnelEnd(v->tile) : GetOtherBridgeEnd(v->tile);
TileIndex endtile = GetOtherTunnelBridgeEnd(v->tile);
if (GetVehicleTunnelBridge(v->tile, endtile) != NULL) return; // tunnel / bridge is busy