Mercurial Mercurial > openttd-ottdgrfs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
(svn r8900) -Fix
authortron
Sun, 25 Feb 2007 11:49:43 +0000
changeset 6481 c069e5454782
parent 6480 767cfeae4dbf
child 6482 3f977d5f9149
(svn r8900) -Fix

Get rid of DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
src/rail.h file | annotate | diff | comparison | revisions
src/train_cmd.cpp file | annotate | diff | comparison | revisions 
--- a/src/rail.h	Sun Feb 25 11:36:19 2007 +0000
+++ b/src/rail.h	Sun Feb 25 11:49:43 2007 +0000
@@ -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	Sun Feb 25 11:36:19 2007 +0000
+++ b/src/train_cmd.cpp	Sun Feb 25 11:49:43 2007 +0000
@@ -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. */
openttd-ottdgrfs