From b60483f25d046714e17078202ea48224d1ecfb0e Mon Sep 17 00:00:00 2001 From: Claudio Tiecher Date: Sun, 17 Mar 2024 14:23:32 +0100 Subject: [PATCH] Part of #21421: Refactor VEHICLE_SEAT_NUM_MASK --- src/openrct2/entity/Guest.cpp | 2 +- src/openrct2/ride/Vehicle.h | 2 +- src/openrct2/scripting/bindings/entity/ScVehicle.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/openrct2/entity/Guest.cpp b/src/openrct2/entity/Guest.cpp index 567b9ff2e6..b7d7cc9be2 100644 --- a/src/openrct2/entity/Guest.cpp +++ b/src/openrct2/entity/Guest.cpp @@ -2581,7 +2581,7 @@ bool Guest::FindVehicleToEnter(const Ride& ride, std::vector& car_array car_array.push_back(i); return true; } - num_seats &= VEHICLE_SEAT_NUM_MASK; + num_seats &= kVehicleSeatNumMask; } if (num_seats == vehicle->next_free_seat) continue; diff --git a/src/openrct2/ride/Vehicle.h b/src/openrct2/ride/Vehicle.h index 5fcebdfc9b..a7e8704983 100644 --- a/src/openrct2/ride/Vehicle.h +++ b/src/openrct2/ride/Vehicle.h @@ -517,7 +517,7 @@ enum }; constexpr uint8_t kVehicleSeatPairFlag{ 0x80 }; -#define VEHICLE_SEAT_NUM_MASK 0x7F +constexpr uint8_t kVehicleSeatNumMask{ 0x7F }; Vehicle* TryGetVehicle(EntityId spriteIndex); void VehicleUpdateAll(); diff --git a/src/openrct2/scripting/bindings/entity/ScVehicle.cpp b/src/openrct2/scripting/bindings/entity/ScVehicle.cpp index 41ace4a6c3..abd7a939fb 100644 --- a/src/openrct2/scripting/bindings/entity/ScVehicle.cpp +++ b/src/openrct2/scripting/bindings/entity/ScVehicle.cpp @@ -155,7 +155,7 @@ namespace OpenRCT2::Scripting uint8_t ScVehicle::numSeats_get() const { auto vehicle = GetVehicle(); - return vehicle != nullptr ? vehicle->num_seats & VEHICLE_SEAT_NUM_MASK : 0; + return vehicle != nullptr ? vehicle->num_seats & kVehicleSeatNumMask : 0; } void ScVehicle::numSeats_set(uint8_t value) { @@ -163,8 +163,8 @@ namespace OpenRCT2::Scripting auto vehicle = GetVehicle(); if (vehicle != nullptr) { - vehicle->num_seats &= ~VEHICLE_SEAT_NUM_MASK; - vehicle->num_seats |= value & VEHICLE_SEAT_NUM_MASK; + vehicle->num_seats &= ~kVehicleSeatNumMask; + vehicle->num_seats |= value & kVehicleSeatNumMask; } }