mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9128) [0.5] -Fix: trains slow down under bridges when they were going down on the tile before the bridge tile.

release/0.5
rubidium 2007-03-11 23:03:14 +00:00
parent e925f8b2c3
commit 5a703390ec
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tunnelbridge_cmd.c
View File

@ -1430,7 +1430,13 @@ static uint32 VehicleEnter_TunnelBridge(Vehicle *v, TileIndex tile, int x, int y
} }
} else if (IsBridge(tile)) { // XXX is this necessary? } else if (IsBridge(tile)) { // XXX is this necessary?
if (v->type == VEH_Road || (v->type == VEH_Train && IsFrontEngine(v))) { if (v->type == VEH_Road || (v->type == VEH_Train && IsFrontEngine(v))) {
if (IsBridgeRamp(tile) || v->z_pos > GetTileMaxZ(tile)) { /* The train calls this (EnterTile) function before entering the tile.
* This has a drawback that the position of the train has not yet
* changed. So, when a train comes down a slope it is above the tile
* height of the current slope. Catch this situation by adding a
* small correction when trying to determine whether the train is on
* the bridge or under the bridge */
if (IsBridgeRamp(tile) || v->z_pos > (GetTileMaxZ(tile) + 1)) {
/* modify speed of vehicle */ /* modify speed of vehicle */
uint16 spd = _bridge[GetBridgeType(tile)].speed; uint16 spd = _bridge[GetBridgeType(tile)].speed;
if (v->type == VEH_Road) spd *= 2; if (v->type == VEH_Road) spd *= 2;