diff options
| author | tron <tron@openttd.org> | 2007-02-25 11:49:43 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2007-02-25 11:49:43 +0000 |
| commit | 311af1a956ac7beda22061503999e185a81f129d (patch) | |
| tree | 2d237053b9b6e0cd97d5ebfe7895d3952a97dcce /src | |
| parent | 3ce4baa9fc9b8973503fdaea37a408ff0852c659 (diff) | |
| download | openttd-311af1a956ac7beda22061503999e185a81f129d.tar.xz | |
(svn r8900) -Fix
Get rid of DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rail.h | 1 | ||||
| -rw-r--r-- | src/train_cmd.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/rail.h b/src/rail.h index 7f3d4330d..622fa60c0 100644 --- a/src/rail.h +++ b/src/rail.h @@ -88,7 +88,6 @@ template <> struct EnumPropsT<TrackBits> : MakeEnumPropsT<TrackBits, byte, TRACK 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 diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index b221c7f9c..f9000fdbb 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. */ |