gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-02 20:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r6791) -Fix: [YAPF] YapfFindNearestRailDepotTwoWay() did not work for train inside tunnel.

Browse Source
This commit is contained in:
KUDr 2006-10-16 19:17:30 +00:00
parent 3fafc6c82b
commit c2736007e5
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
yapf/yapf_rail.cpp
View File

@ -239,6 +239,8 @@ bool YapfCheckReverseTrain(Vehicle* v)
return reverse; return reverse;
} }
static TileIndex YapfGetVehicleOutOfTunnelTile(const Vehicle *v, bool bReverse);
bool YapfFindNearestRailDepotTwoWay(Vehicle *v, int max_distance, int reverse_penalty, TileIndex* depot_tile, bool* reversed) bool YapfFindNearestRailDepotTwoWay(Vehicle *v, int max_distance, int reverse_penalty, TileIndex* depot_tile, bool* reversed)
{ {
*depot_tile = INVALID_TILE; *depot_tile = INVALID_TILE;
@ -250,12 +252,12 @@ bool YapfFindNearestRailDepotTwoWay(Vehicle *v, int max_distance, int reverse_pe
bool last_in_tunnel = last_veh->u.rail.track == 0x40; bool last_in_tunnel = last_veh->u.rail.track == 0x40;
// tile where the engine and last wagon are // tile where the engine and last wagon are
TileIndex tile = first_in_tunnel ? INVALID_TILE : v->tile; TileIndex tile = first_in_tunnel ? YapfGetVehicleOutOfTunnelTile(v, false) : v->tile;
TileIndex last_tile = last_in_tunnel ? INVALID_TILE : last_veh->tile; TileIndex last_tile = last_in_tunnel ? YapfGetVehicleOutOfTunnelTile(last_veh, true) : last_veh->tile;
// their trackdirs // their trackdirs
Trackdir td = first_in_tunnel ? INVALID_TRACKDIR : GetVehicleTrackdir(v); Trackdir td = GetVehicleTrackdir(v);
Trackdir td_rev = last_in_tunnel ? INVALID_TRACKDIR : ReverseTrackdir(GetVehicleTrackdir(last_veh)); Trackdir td_rev = ReverseTrackdir(GetVehicleTrackdir(last_veh));
typedef bool (*PfnFindNearestDepotTwoWay)(Vehicle*, TileIndex, Trackdir, TileIndex, Trackdir, int, int, TileIndex*, bool*); typedef bool (*PfnFindNearestDepotTwoWay)(Vehicle*, TileIndex, Trackdir, TileIndex, Trackdir, int, int, TileIndex*, bool*);
PfnFindNearestDepotTwoWay pfnFindNearestDepotTwoWay = &CYapfAnyDepotRail2::stFindNearestDepotTwoWay; PfnFindNearestDepotTwoWay pfnFindNearestDepotTwoWay = &CYapfAnyDepotRail2::stFindNearestDepotTwoWay;
@ -270,6 +272,38 @@ bool YapfFindNearestRailDepotTwoWay(Vehicle *v, int max_distance, int reverse_pe
return ret; return ret;
} }
/** Retrieve the exit-tile of the vehicle from inside a tunnel
* Very similar to GetOtherTunnelEnd(), but we use the vehicle's
* direction for determining which end of the tunnel to find
* @param v the vehicle which is inside the tunnel and needs an exit
* @param bReverse should we search for the tunnel exit in the opposite direction?
* @return the exit-tile of the tunnel based on the vehicle's direction
* taken from tunnelbridge_cmd.c where the function body was disabled by
* #if 1 #else #endif (at r5951). Added bReverse argument to allow two-way
* operation (YapfFindNearestRailDepotTwoWay). */
static TileIndex YapfGetVehicleOutOfTunnelTile(const Vehicle *v, bool bReverse)
{
TileIndex tile = v->tile;
DiagDirection dir = DirToDiagDir((Direction)v->direction);
TileIndexDiff delta = TileOffsByDiagDir(dir);
byte z = v->z_pos;
if (bReverse) {
delta = -delta;
} else {
dir = ReverseDiagDir(dir);
}
while (
!IsTunnelTile(tile) ||
GetTunnelDirection(tile) != dir ||
GetTileZ(tile) != z
) {
tile += delta;
}
return tile;
}
/** if any track changes, this counter is incremented - that will invalidate segment cost cache */ /** if any track changes, this counter is incremented - that will invalidate segment cost cache */
int CSegmentCostCacheBase::s_rail_change_counter = 0; int CSegmentCostCacheBase::s_rail_change_counter = 0;