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

(svn r8052) - Codechange: RemoveFirstTrack() and RemoveFirstTrackdir() now accept pointer to TrackBits/TrackdirBits instead of reference.

Browse Source
This commit is contained in:
KUDr
2007-01-11 10:34:42 +00:00
parent b71fa18db3
commit 8553b0dad5
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/rail.h
View File

@@ -250,11 +250,11 @@ static inline TrackdirBits TrackdirToTrackdirBits(Trackdir trackdir) { return (T
/**
* Removes first Track from TrackBits and returns it
*/
static inline Track RemoveFirstTrack(TrackBits &tracks)
static inline Track RemoveFirstTrack(TrackBits *tracks)
{
if (tracks != TRACK_BIT_NONE && tracks != INVALID_TRACK_BIT) {
Track first = (Track)FIND_FIRST_BIT(tracks);
tracks = ClrBitT(tracks, first);
if (*tracks != TRACK_BIT_NONE && *tracks != INVALID_TRACK_BIT) {
Track first = (Track)FIND_FIRST_BIT(*tracks);
*tracks = ClrBitT(*tracks, first);
return first;
}
return INVALID_TRACK;
@@ -263,11 +263,11 @@ static inline Track RemoveFirstTrack(TrackBits &tracks)
/**
* Removes first Trackdir from TrackdirBits and returns it
*/
static inline Trackdir RemoveFirstTrackdir(TrackdirBits &trackdirs)
static inline Trackdir RemoveFirstTrackdir(TrackdirBits *trackdirs)
{
if (trackdirs != TRACKDIR_BIT_NONE && trackdirs != INVALID_TRACKDIR_BIT) {
Trackdir first = (Trackdir)FindFirstBit2x64(trackdirs);
trackdirs = ClrBitT(trackdirs, first);
if (*trackdirs != TRACKDIR_BIT_NONE && *trackdirs != INVALID_TRACKDIR_BIT) {
Trackdir first = (Trackdir)FindFirstBit2x64(*trackdirs);
*trackdirs = ClrBitT(*trackdirs, first);
return first;
}
return INVALID_TRACKDIR;