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

Try something

Browse Source 
This doesn't work but hey... it's broken already in combination with realistic breaking
This commit is contained in:
Andreas Schmitt
2021-06-18 06:25:43 +02:00
parent debc504e59
commit 02278f7a6f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/train_cmd.cpp
View File

@@ -987,7 +987,6 @@ int Train::GetAtcMaxSpeed(int current_max_speed) const
HasReservedTracks(ft.m_new_tile, TrackdirBitsToTrackBits(ft.m_new_td_bits))) { ///< Tile is reserved HasReservedTracks(ft.m_new_tile, TrackdirBitsToTrackBits(ft.m_new_td_bits))) { ///< Tile is reserved
Train* other_train = GetTrainForReservation(ft.m_new_tile, TrackBitsToTrack(TrackdirBitsToTrackBits(ft.m_new_td_bits))); Train* other_train = GetTrainForReservation(ft.m_new_tile, TrackBitsToTrack(TrackdirBitsToTrackBits(ft.m_new_td_bits)));
if (other_train != nullptr && if (other_train != nullptr &&
other_train != this && ///< Other train is not this train other_train != this && ///< Other train is not this train
other_train->GetAccelerationStatus() != AS_BRAKE) { ///< Other train is not braking other_train->GetAccelerationStatus() != AS_BRAKE) { ///< Other train is not braking
@@ -1005,9 +1004,13 @@ int Train::GetAtcMaxSpeed(int current_max_speed) const
old_td = FindFirstTrackdir(reserved); old_td = FindFirstTrackdir(reserved);
} }
else if (KillFirstBit(ft.m_new_td_bits) != TRACKDIR_BIT_NONE) { else if (KillFirstBit(ft.m_new_td_bits) != TRACKDIR_BIT_NONE) {
// Tile has more than one track and we have no reservation. Bail out. bool path_found = false;
old_td = TrackToTrackdir(YapfTrainChooseTrack(this, ft.m_new_tile, ft.m_exitdir, TrackdirBitsToTrackBits(ft.m_new_td_bits), path_found, false, nullptr));
if(!path_found || old_td == INVALID_TRACKDIR) {
// Tile has more than one track and we have no path. Bail out.
break; break;
} }
}
else { else {
// There was no reservation but there is only one direction to follow, so follow it. // There was no reservation but there is only one direction to follow, so follow it.
old_td = FindFirstTrackdir(ft.m_new_td_bits); old_td = FindFirstTrackdir(ft.m_new_td_bits);