From 2c4c2da31981de5625a16e7b5232db98bad0c327 Mon Sep 17 00:00:00 2001
From: Claudio Tiecher <ctiecher@gmail.com>
Date: Sun, 17 Mar 2024 14:20:38 +0100
Subject: [PATCH] Part of #21421: Refactor VEHICLE_SEAT_PAIR_FLAG

---
 src/openrct2/object/RideObject.cpp | 2 +-
 src/openrct2/ride/Vehicle.cpp      | 2 +-
 src/openrct2/ride/Vehicle.h        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index f5ce445d68..5dd997e63a 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/src/openrct2/object/RideObject.cpp
@@ -714,7 +714,7 @@ CarEntry RideObject::ReadJsonCar([[maybe_unused]] IReadObjectContext* context, j
     car.num_seats = Json::GetNumber<uint8_t>(jCar["numSeats"]);
     if (Json::GetBoolean(jCar["seatsInPairs"], true) && car.num_seats > 1)
     {
-        car.num_seats |= VEHICLE_SEAT_PAIR_FLAG;
+        car.num_seats |= kVehicleSeatPairFlag;
     }
 
     car.sprite_width = Json::GetNumber<uint8_t>(jCar["spriteWidth"]);
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index e5d9a107eb..c48ce37031 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -5115,7 +5115,7 @@ Vehicle* Vehicle::TrainTail() const
 
 int32_t Vehicle::IsUsedInPairs() const
 {
-    return num_seats & VEHICLE_SEAT_PAIR_FLAG;
+    return num_seats & kVehicleSeatPairFlag;
 }
 
 /**
diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h
index 95dd53b5f6..5fcebdfc9b 100644
--- a/src/openrct2/ride/Vehicle.h
+++ b/src/openrct2/ride/Vehicle.h
@@ -516,7 +516,7 @@ enum
     SOUND_RANGE_NONE = 255
 };
 
-#define VEHICLE_SEAT_PAIR_FLAG 0x80
+constexpr uint8_t kVehicleSeatPairFlag{ 0x80 };
 #define VEHICLE_SEAT_NUM_MASK 0x7F
 
 Vehicle* TryGetVehicle(EntityId spriteIndex);