gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-07 06:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r8900) -Fix

Browse Source 
Get rid of DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
This commit is contained in:
tron 2007-02-25 11:49:43 +00:00
parent 3ce4baa9fc
commit 311af1a956
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rail.h
View File

@ -88,7 +88,6 @@ template <> struct EnumPropsT<TrackBits> : MakeEnumPropsT<TrackBits, byte, TRACK
typedef TinyEnumT<TrackBits> TrackBitsByte; typedef TinyEnumT<TrackBits> TrackBitsByte;
DECLARE_ENUM_AS_BIT_SET(TrackBits); DECLARE_ENUM_AS_BIT_SET(TrackBits);
DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits);
/** /**
* Maps a Track to the corresponding TrackBits value * Maps a Track to the corresponding TrackBits value

2
src/train_cmd.cpp
View File

@ -2948,7 +2948,7 @@ static void TrainController(Vehicle *v, bool update_image)
if (prev == NULL) { if (prev == NULL) {
/* Currently the locomotive is active. Determine which one of the /* Currently the locomotive is active. Determine which one of the
* available tracks to choose */ * available tracks to choose */
chosen_track = 1 << ChooseTrainTrack(v, gp.new_tile, enterdir, bits); chosen_track = TrackToTrackBits(ChooseTrainTrack(v, gp.new_tile, enterdir, bits));
assert(chosen_track & tracks); assert(chosen_track & tracks);
/* Check if it's a red signal and that force proceed is not clicked. */ /* Check if it's a red signal and that force proceed is not clicked. */