diff options
| author | rubidium <rubidium@openttd.org> | 2007-02-26 22:25:18 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-02-26 22:25:18 +0000 |
| commit | 413853552ce74e218c65c2982d40e2a4a86488c4 (patch) | |
| tree | 52c3ac24b16ef5c19384e8f09b7fb1b7792b9224 | |
| parent | aaeeef3d88333098f2630f2975dfeadcbfa08cbb (diff) | |
| download | openttd-413853552ce74e218c65c2982d40e2a4a86488c4.tar.xz | |
(svn r8911) -Cleanup: fixup comments about the RoadVehicleStates and remove two unused enums.
| -rw-r--r-- | src/vehicle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicle.h b/src/vehicle.h index 789a03896..a0b7fb875 100644 --- a/src/vehicle.h +++ b/src/vehicle.h @@ -31,12 +31,14 @@ enum VehicleEnterTileStatus { enum RoadVehicleStates { /* * Lower 4 bits are used for vehicle track direction. (Trackdirs) - * When in a road stop (bit 5 set) these bits give the + * When in a road stop (bit 5 or bit 6 set) these bits give the * track direction of the entry to the road stop. * As the entry direction will always be a diagonal * direction (X_NE, Y_SE, X_SW or Y_NW) only bits 0 and 3 * are needed to hold this direction. Bit 1 is then used to show * that the vehicle is using the second road stop bay. + * Bit 2 is then used for drive-through stops to show the vehicle + * is stopping at this road stop. */ /* Numeric values */ @@ -46,13 +48,11 @@ enum RoadVehicleStates { /* Bit numbers */ RVS_USING_SECOND_BAY = 1, ///< Only used while in a road stop RVS_IS_STOPPING = 2, ///< Only used for drive-through stops. Vehicle will stop here - RVS_DRIVE_SIDE = 4, ///< Only used when retrieving move data and for turning vehicles + RVS_DRIVE_SIDE = 4, ///< Only used when retrieving move data RVS_IN_ROAD_STOP = 5, ///< The vehicle is in a road stop RVS_IN_DT_ROAD_STOP = 6, ///< The vehicle is in a drive-through road stop /* Bit sets of the above specified bits */ - RVSB_USING_SECOND_BAY = 1 << RVS_USING_SECOND_BAY, ///< Only used while in a road stop - RVSB_DRIVE_SIDE = 1 << RVS_DRIVE_SIDE, ///< Only used when retrieving move data and for turning vehicles RVSB_IN_ROAD_STOP = 1 << RVS_IN_ROAD_STOP, ///< The vehicle is in a road stop RVSB_IN_ROAD_STOP_END = RVSB_IN_ROAD_STOP + TRACKDIR_END, RVSB_IN_DT_ROAD_STOP = 1 << RVS_IN_DT_ROAD_STOP, ///< The vehicle is in a drive-through road stop |