(svn r19788) -Codechange: make FOR_EACH_SET_BIT not change the value of the passed bit variable, i.e. allow expressions as parameter

2010-05-11 20:48:06 +00:00
parent 862321c62a
commit ee02599bbf
5 changed files with 12 additions and 14 deletions
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@ -921,9 +921,8 @@ static void NPFFollowTrack(AyStar *aystar, OpenListNode *current)
 		TrackBits reserved = GetReservedTrackbits(dst_tile);
 		trackdirbits &= ~TrackBitsToTrackdirBits(reserved);

-		uint bits = TrackdirBitsToTrackBits(trackdirbits);
 		int i;
-		FOR_EACH_SET_BIT(i, bits) {
+		FOR_EACH_SET_BIT(i, TrackdirBitsToTrackBits(trackdirbits)) {
 			if (TracksOverlap(reserved | TrackToTrackBits((Track)i))) trackdirbits &= ~TrackToTrackdirBits((Track)i);
 		}
 	}