diff options
| author | smatz <smatz@openttd.org> | 2008-01-04 19:45:29 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2008-01-04 19:45:29 +0000 |
| commit | 7302d8c88b25e08a414ebf4e8e83abffc1c3961a (patch) | |
| tree | 9a2deee8e62f246ba97175135518232409950b73 /src/train_cmd.cpp | |
| parent | 9299f76af42eb4c8ca8d7077fc60f87c2d962047 (diff) | |
| download | openttd-7302d8c88b25e08a414ebf4e8e83abffc1c3961a.tar.xz | |
(svn r11760) -Codechange: unify the way how other end of a tunnel/bridge is determined at some places
-Fix: adding road/tram to tram/road bridge was cheaper by one tile
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 02fd41069..379c2343a 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -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 |