From 3ca84dcc1752bdbbaf6f350d5e5d458f96d6c67e Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 1 Jul 2017 12:24:38 +0100
Subject: [PATCH] Refactor vehicle logic related to #5749

---
 src/openrct2/ride/cable_lift.c | 8 ++++----
 src/openrct2/ride/ride.c       | 6 +++---
 src/openrct2/ride/vehicle.c    | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/openrct2/ride/cable_lift.c b/src/openrct2/ride/cable_lift.c
index 127165be8a..b2de73597a 100644
--- a/src/openrct2/ride/cable_lift.c
+++ b/src/openrct2/ride/cable_lift.c
@@ -224,7 +224,7 @@ static bool sub_6DF01A_loop(rct_vehicle* vehicle) {
         uint8 trackType = vehicle->track_type >> 2;
         if (trackType == TRACK_ELEM_CABLE_LIFT_HILL &&
             vehicle->track_progress == 160) {
-            _vehicleMotionTrackFlags |= (1 << 1);
+            _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_1;
         }
 
         uint16 trackProgress = vehicle->track_progress + 1;
@@ -342,7 +342,7 @@ static bool sub_6DF21B_loop(rct_vehicle* vehicle) {
             vehicle->track_type |= output.begin_element->properties.track.type << 2;
 
             if (output.begin_element->properties.track.type == TRACK_ELEM_END_STATION) {
-                _vehicleMotionTrackFlags = (1 << 0);
+                _vehicleMotionTrackFlags = VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_STATION;
             }
 
             moveInfo = vehicle_get_move_info(vehicle->var_CD, vehicle->track_type, 0);
@@ -426,7 +426,7 @@ sint32 cable_lift_update_track_motion(rct_vehicle *cableLift)
                         break;
                     }
                     else {
-                        _vehicleMotionTrackFlags |= (1 << 5);
+                        _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
                         _vehicleVelocityF64E0C -= vehicle->remaining_distance - 13962;
                         vehicle->remaining_distance = 13962;
                         vehicle->acceleration += dword_9A2970[vehicle->vehicle_sprite_type];
@@ -439,7 +439,7 @@ sint32 cable_lift_update_track_motion(rct_vehicle *cableLift)
                         break;
                     }
                     else {
-                        _vehicleMotionTrackFlags |= (1 << 5);
+                        _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
                         _vehicleVelocityF64E0C -= vehicle->remaining_distance + 1;
                         vehicle->remaining_distance = -1;
                         vehicle->acceleration += dword_9A2970[vehicle->vehicle_sprite_type];
diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c
index 586b6a37d5..9e6e1f0d8b 100644
--- a/src/openrct2/ride/ride.c
+++ b/src/openrct2/ride/ride.c
@@ -4868,7 +4868,7 @@ void loc_6DDF9C(rct_ride *ride, rct_map_element *mapElement)
         vehicle_update_track_motion(train, NULL);
 
         do {
-            mapElement->flags |= (1 << 5);
+            mapElement->flags |= MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED;
             car = train;
             while (true) {
                 car->velocity = 0;
@@ -4882,9 +4882,9 @@ void loc_6DDF9C(rct_ride *ride, rct_map_element *mapElement)
                 }
                 car = GET_VEHICLE(spriteIndex);
             }
-        } while (!(vehicle_update_track_motion(train, NULL) & 0x400));
+        } while (!(vehicle_update_track_motion(train, NULL) & VEHICLE_UPDATE_MOTION_TRACK_FLAG_10));
 
-        mapElement->flags |= (1 << 5);
+        mapElement->flags |= MAP_ELEMENT_FLAG_BLOCK_BRAKE_CLOSED;
         car = train;
         while (true) {
             car->update_flags &= ~VEHICLE_UPDATE_FLAG_1;
diff --git a/src/openrct2/ride/vehicle.c b/src/openrct2/ride/vehicle.c
index b86cd7cc64..1ea0ccd2d0 100644
--- a/src/openrct2/ride/vehicle.c
+++ b/src/openrct2/ride/vehicle.c
@@ -8293,7 +8293,7 @@ loc_6DC99A:
     goto loc_6DC462;
 
 loc_6DC9BC:
-    _vehicleMotionTrackFlags |= 0x20;
+    _vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_5;
     regs.eax = vehicle->remaining_distance + 1;
     _vehicleVelocityF64E0C -= regs.eax;
     vehicle->remaining_distance -= regs.eax;