Mercurial > hg > openttd

changeset 6155:09afc32cc744 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8900) -Fix Get rid of DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
author tron <tron@openttd.org>
date Sun, 25 Feb 2007 11:49:43 +0000
parents 238db87ae59e
children b32f90d510ef
files src/rail.h src/train_cmd.cpp
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/rail.h
+++ b/src/rail.h
@@ -88,7 +88,6 @@
 typedef TinyEnumT<TrackBits> TrackBitsByte;
 
 DECLARE_ENUM_AS_BIT_SET(TrackBits);
-DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits);
 
 /**
  * Maps a Track to the corresponding TrackBits value
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2948,7 +2948,7 @@
 				if (prev == NULL) {
 					/* Currently the locomotive is active. Determine which one of the
 					 * 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);
 
 					/* Check if it's a red signal and that force proceed is not clicked. */