From aa7d181070080d8e63f4c70b90fa8d0d16ccffb9 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Tue, 26 Feb 2019 16:49:29 +0000
Subject: [PATCH] Define constants for vehicle type

---
 src/openrct2/ride/CableLift.cpp | 2 +-
 src/openrct2/ride/Ride.cpp      | 2 +-
 src/openrct2/ride/Vehicle.h     | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp
index 2610156087..3474ef89e2 100644
--- a/src/openrct2/ride/CableLift.cpp
+++ b/src/openrct2/ride/CableLift.cpp
@@ -39,7 +39,7 @@ rct_vehicle* cable_lift_segment_create(
         move_sprite_to_list((rct_sprite*)current, SPRITE_LIST_TRAIN * 2);
         ride->cable_lift = current->sprite_index;
     }
-    current->type = head ? 0 : 1;
+    current->type = head ? VEHICLE_TYPE_HEAD : VEHICLE_TYPE_TAIL;
     current->var_44 = var_44;
     current->remaining_distance = remaining_distance;
     current->sprite_width = 10;
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 39cc51a48c..9a117dde36 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -4840,7 +4840,7 @@ static rct_vehicle* vehicle_create_car(
     vehicle->ride_subtype = ride->subtype;
 
     vehicle->vehicle_type = vehicleEntryIndex;
-    vehicle->type = carIndex == 0 ? 0 : 1;
+    vehicle->type = carIndex == 0 ? VEHICLE_TYPE_HEAD : VEHICLE_TYPE_TAIL;
     vehicle->var_44 = ror32(vehicleEntry->spacing, 10) & 0xFFFF;
     edx = vehicleEntry->spacing >> 1;
     *remainingDistance -= edx;
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index c56d827cb7..e82ab5a15e 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -105,6 +105,12 @@ static_assert(sizeof(rct_ride_entry_vehicle) % 4 == 0, "Invalid struct size");
 static_assert(sizeof(rct_ride_entry_vehicle) % 8 == 0, "Invalid struct size");
 #endif
 
+enum VEHICLE_TYPE : uint8_t
+{
+    VEHICLE_TYPE_HEAD = 0,
+    VEHICLE_TYPE_TAIL = 1,
+};
+
 struct rct_vehicle : rct_sprite_common
 {
     uint8_t vehicle_sprite_type; // 0x1F
@@ -223,7 +229,7 @@ struct rct_vehicle : rct_sprite_common
 
     constexpr bool IsHead() const
     {
-        return type == 0;
+        return type == VEHICLE_TYPE_HEAD;
     }
     rct_vehicle* GetHead();
     const rct_vehicle* GetHead() const;