Remove some hardcoded numbers (#11004)

OpenRCT2 · Mar 23, 2020 · e66a675 · e66a675
1 parent 9860f1e
commit e66a675
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/openrct2/actions/RideCreateAction.hpp b/src/openrct2/actions/RideCreateAction.hpp
@@ -87,7 +87,7 @@ DEFINE_GAME_ACTION(RideCreateAction, GAME_COMMAND_CREATE_RIDE, RideCreateGameAct
         }
 
         int32_t rideEntryIndex = ride_get_entry_index(_rideType, _subType);
-        if (rideEntryIndex >= 128)
+        if (rideEntryIndex >= MAX_RIDE_OBJECTS)
         {
             return MakeResult(GA_ERROR::INVALID_PARAMETERS, STR_INVALID_RIDE_TYPE);
         }

diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
@@ -3062,7 +3062,7 @@ static bool ride_does_vehicle_colour_exist(uint8_t ride_sub_type, vehicle_colour
 
 int32_t ride_get_unused_preset_vehicle_colour(uint8_t ride_sub_type)
 {
-    if (ride_sub_type >= 128)
+    if (ride_sub_type >= MAX_RIDE_OBJECTS)
     {
         return 0;
     }
@@ -5554,7 +5554,7 @@ bool Ride::NameExists(const std::string_view& name, ride_id_t excludeRideId)
  */
 int32_t ride_get_random_colour_preset_index(uint8_t ride_type)
 {
-    if (ride_type >= 128)
+    if (ride_type >= std::size(RideColourPresets))
     {
         return 0;
     }