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

Codechange: Remove FOR_EACH_SET_TRACK

Browse Source
This commit is contained in:
glx22
2021-06-13 05:15:36 +02:00
committed by Loïc Guilloux
parent a543a4b7bb
commit 49b66ea504
5 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pathfinder/follow_track.hpp
View File

@@ -184,8 +184,7 @@ struct CFollowTrackT
/* Mask already reserved trackdirs. */
m_new_td_bits &= ~TrackBitsToTrackdirBits(reserved);
/* Mask out all trackdirs that conflict with the reservation. */
Track t;
FOR_EACH_SET_TRACK(t, TrackdirBitsToTrackBits(m_new_td_bits)) {
for (Track t : SetTrackBitIterator(TrackdirBitsToTrackBits(m_new_td_bits))) {
if (TracksOverlap(reserved | TrackToTrackBits(t))) m_new_td_bits &= ~TrackToTrackdirBits(t);
}
if (m_new_td_bits == TRACKDIR_BIT_NONE) {

3
src/pathfinder/npf/npf.cpp
View File

@@ -954,8 +954,7 @@ static void NPFFollowTrack(AyStar *aystar, OpenListNode *current)
TrackBits reserved = GetReservedTrackbits(dst_tile);
trackdirbits &= ~TrackBitsToTrackdirBits(reserved);
Track t;
FOR_EACH_SET_TRACK(t, TrackdirBitsToTrackBits(trackdirbits)) {
for (Track t : SetTrackBitIterator(TrackdirBitsToTrackBits(trackdirbits))) {
if (TracksOverlap(reserved | TrackToTrackBits(t))) trackdirbits &= ~TrackToTrackdirBits(t);
}
}