From 311af1a956ac7beda22061503999e185a81f129d Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 25 Feb 2007 11:49:43 +0000 Subject: [PATCH] (svn r8900) -Fix Get rid of DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits) --- src/rail.h | 1 - src/train_cmd.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rail.h b/src/rail.h index 7f3d4330de..622fa60c00 100644 --- a/src/rail.h +++ b/src/rail.h @@ -88,7 +88,6 @@ template <> struct EnumPropsT : MakeEnumPropsT TrackBitsByte; DECLARE_ENUM_AS_BIT_SET(TrackBits); -DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits); /** * Maps a Track to the corresponding TrackBits value diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index b221c7f9cf..f9000fdbb6 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2948,7 +2948,7 @@ static void TrainController(Vehicle *v, bool update_image) 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. */