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

Merge branch 'cargo_type_order' into jgrpp

Browse Source 
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
This commit is contained in:
Jonathan G Rennison
2018-07-02 21:04:06 +01:00
parent 79ca5c8b7d 00b1fe6246
commit 3330e4cef8
45 changed files with 183 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/track_func.h
View File

@@ -61,7 +61,7 @@ static inline bool IsValidTrackdirForRoadVehicle(Trackdir trackdir)
*/
static inline bool IsValidTrackdir(Trackdir trackdir)
{
return trackdir < TRACKDIR_END && ((1 << trackdir & TRACKDIR_BIT_MASK) != 0);
return trackdir < TRACKDIR_END && ((1 << trackdir & TRACKDIR_BIT_MASK) != TRACKDIR_BIT_NONE);
}
/**
@@ -331,6 +331,28 @@ static inline TrackdirBits TrackBitsToTrackdirBits(TrackBits bits)
return (TrackdirBits)(bits * 0x101);
}
/**
* Checks whether a TrackBits has a given Track.
* @param tracks The track bits.
* @param track The track to check.
*/
static inline bool HasTrack(TrackBits tracks, Track track)
{
assert(IsValidTrack(track));
return HasBit(tracks, track);
}
/**
* Checks whether a TrackdirBits has a given Trackdir.
* @param trackdirs The trackdir bits.
* @param trackdir The trackdir to check.
*/
static inline bool HasTrackdir(TrackdirBits trackdirs, Trackdir trackdir)
{
assert(IsValidTrackdir(trackdir));
return HasBit(trackdirs, trackdir);
}
/**
* Returns the present-trackdir-information of a TrackStatus.
*