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

Fix tram reversing on custom bridge head tiles.

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-06-21 23:40:19 +01:00
parent 27ac2f5894
commit 0a345efc27
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/roadveh_cmd.cpp
View File

@@ -1113,7 +1113,7 @@ static Trackdir FollowPreviousRoadVehicle(const RoadVehicle *v, const RoadVehicl
}; };
RoadBits required = required_roadbits[dir & 0x07]; RoadBits required = required_roadbits[dir & 0x07];
if ((required & GetAnyRoadBits(tile, v->roadtype, true)) == ROAD_NONE) { if ((required & GetAnyRoadBits(tile, v->roadtype, false)) == ROAD_NONE) {
dir = INVALID_TRACKDIR; dir = INVALID_TRACKDIR;
} }
@@ -1367,7 +1367,7 @@ again:
Trackdir dir; Trackdir dir;
uint turn_around_start_frame = RVC_TURN_AROUND_START_FRAME; uint turn_around_start_frame = RVC_TURN_AROUND_START_FRAME;
if (v->roadtype == ROADTYPE_TRAM && !IsRoadDepotTile(v->tile) && HasExactlyOneBit(GetAnyRoadBits(v->tile, ROADTYPE_TRAM, true))) { if (v->roadtype == ROADTYPE_TRAM && !IsRoadDepotTile(v->tile) && HasExactlyOneBit(GetAnyRoadBits(v->tile, ROADTYPE_TRAM, false))) {
/* /*
* The tram is turning around with one tram 'roadbit'. This means that * The tram is turning around with one tram 'roadbit'. This means that
* it is using the 'big' corner 'drive data'. However, to support the * it is using the 'big' corner 'drive data'. However, to support the

6
src/tunnelbridge_cmd.cpp
View File

@@ -2235,6 +2235,12 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti
case VEH_ROAD: { case VEH_ROAD: {
RoadVehicle *rv = RoadVehicle::From(v); RoadVehicle *rv = RoadVehicle::From(v);
if (IsRoadCustomBridgeHeadTile(tile)) {
RoadBits bits = ROAD_NONE;
if (rv->compatible_roadtypes & ROADTYPES_TRAM) bits |= GetCustomBridgeHeadRoadBits(tile, ROADTYPE_TRAM);
if (rv->compatible_roadtypes & ROADTYPES_ROAD) bits |= GetCustomBridgeHeadRoadBits(tile, ROADTYPE_ROAD);
if (!(bits & DiagDirToRoadBits(GetTunnelBridgeDirection(tile)))) return VETSB_CONTINUE;
}
rv->cur_image_valid_dir = INVALID_DIR; rv->cur_image_valid_dir = INVALID_DIR;
rv->state = RVSB_WORMHOLE; rv->state = RVSB_WORMHOLE;
/* There are no slopes inside bridges / tunnels. */ /* There are no slopes inside bridges / tunnels. */