Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use result flags for TryPathReserve

Browse Source
This commit is contained in:
Jonathan G Rennison 2024-08-28 01:07:27 +01:00
parent c286210902
commit 0c3d1e1aac
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/train.h
View File

@ -81,7 +81,20 @@ uint8_t FreightWagonMult(CargoID cargo);
void CheckTrainsLengths();
void FreeTrainTrackReservation(Train *v, TileIndex origin = INVALID_TILE, Trackdir orig_td = INVALID_TRACKDIR);
bool TryPathReserve(Train *v, bool mark_as_stuck = false, bool first_tile_okay = false);
/** Result flags for TryPathReserveWithResultFlags */
enum TryPathReserveResultFlags {
TPRRF_NONE = 0, ///< No flags
TPRRF_RESERVATION_OK = 0x01, ///< Reservation OK
};
DECLARE_ENUM_AS_BIT_SET(TryPathReserveResultFlags)
TryPathReserveResultFlags TryPathReserveWithResultFlags(Train *v, bool mark_as_stuck = false, bool first_tile_okay = false);
inline bool TryPathReserve(Train *v, bool mark_as_stuck = false, bool first_tile_okay = false)
{
return TryPathReserveWithResultFlags(v, mark_as_stuck, first_tile_okay) & TPRRF_RESERVATION_OK;
}
void DeleteVisibleTrain(Train *v);

20
src/train_cmd.cpp
View File

@ -4670,15 +4670,15 @@ static ChooseTrainTrackResult ChooseTrainTrack(Train *v, TileIndex tile, DiagDir
* @param v The vehicle
* @param mark_as_stuck Should the train be marked as stuck on a failed reservation?
* @param first_tile_okay True if no path should be reserved if the current tile is a safe position.
* @return True if a path could be reserved.
* @return Result flags.
*/
bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
TryPathReserveResultFlags TryPathReserveResultFlags(Train *v, bool mark_as_stuck, bool first_tile_okay)
{
dbg_assert(v->IsFrontEngine());
ClearLookAheadIfInvalid(v);
if (v->lookahead != nullptr && HasBit(v->lookahead->flags, TRLF_DEPOT_END)) return true;
if (v->lookahead != nullptr && HasBit(v->lookahead->flags, TRLF_DEPOT_END)) return TPRRF_RESERVATION_OK;
/* We have to handle depots specially as the track follower won't look
* at the depot tile itself but starts from the next tile. If we are still
@ -4686,18 +4686,18 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
if (v->track == TRACK_BIT_DEPOT) {
if (HasDepotReservation(v->tile)) {
if (mark_as_stuck) MarkTrainAsStuck(v);
return false;
return TPRRF_NONE;
} else {
/* Depot not reserved, but the next tile might be. */
TileIndex next_tile = TileAddByDiagDir(v->tile, GetRailDepotDirection(v->tile));
if (HasReservedTracks(next_tile, DiagdirReachesTracks(GetRailDepotDirection(v->tile)))) return false;
if (HasReservedTracks(next_tile, DiagdirReachesTracks(GetRailDepotDirection(v->tile)))) return TPRRF_NONE;
}
}
if (IsTileType(v->tile, MP_TUNNELBRIDGE) && IsTunnelBridgeSignalSimulationExitOnly(v->tile) &&
TrackdirEntersTunnelBridge(v->tile, v->GetVehicleTrackdir())) {
/* prevent any attempt to reserve the wrong way onto a tunnel/bridge exit */
return false;
return TPRRF_NONE;
}
if (IsTunnelBridgeWithSignalSimulation(v->tile) && ((v->track & TRACK_BIT_WORMHOLE) || TrackdirEntersTunnelBridge(v->tile, v->GetVehicleTrackdir()))) {
DiagDirection tunnel_bridge_dir = GetTunnelBridgeDirection(v->tile);
@ -4720,10 +4720,10 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
v_pos += TileOffsByDiagDir(tunnel_bridge_dir);
}
if (v_pos == exit) {
return CheckTrainStayInWormHolePathReserve(v, exit);
return CheckTrainStayInWormHolePathReserve(v, exit) ? TPRRF_RESERVATION_OK : TPRRF_NONE;
}
}
return false;
return TPRRF_NONE;
}
}
@ -4736,7 +4736,7 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
* make matters worse. */
if (other_train != nullptr && other_train->index != v->index) {
if (mark_as_stuck) MarkTrainAsStuck(v);
return false;
return TPRRF_NONE;
}
/* If we have a reserved path and the path ends at a safe tile, we are finished already. */
if (origin.okay && (v->tile != origin.tile || first_tile_okay)) {
@ -4747,7 +4747,7 @@ bool TryPathReserve(Train *v, bool mark_as_stuck, bool first_tile_okay)
FillTrainReservationLookAhead(v);
TryLongReserveChooseTrainTrackFromReservationEnd(v, true);
}
return true;
return TPRRF_RESERVATION_OK;
}
/* If we are in a depot, tentatively reserve the depot. */