From ca27c2181b69238223b748943a5d2816df4fdfc0 Mon Sep 17 00:00:00 2001
From: Michael Steenbeek <m.o.steenbeek@gmail.com>
Date: Wed, 5 Jan 2022 14:16:16 +0100
Subject: [PATCH] Clean up two hardcoded vehicle maxes

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

diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index bb65c054b6..00364e41a4 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -3127,7 +3127,7 @@ static Vehicle* vehicle_create_car(
     vehicle->bank_rotation = 0;
     vehicle->target_seat_rotation = 4;
     vehicle->seat_rotation = 4;
-    for (int32_t i = 0; i < 32; i++)
+    for (size_t i = 0; i < std::size(vehicle->peep); i++)
     {
         vehicle->peep[i] = SPRITE_INDEX_NULL;
     }
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index e023466685..e36e021834 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -6131,8 +6131,8 @@ void Vehicle::SetMapToolbar() const
     {
         const Vehicle* vehicle = GetHead();
 
-        int32_t vehicleIndex;
-        for (vehicleIndex = 0; vehicleIndex < 32; vehicleIndex++)
+        size_t vehicleIndex;
+        for (vehicleIndex = 0; vehicleIndex < std::size(curRide->vehicles); vehicleIndex++)
             if (curRide->vehicles[vehicleIndex] == vehicle->sprite_index)
                 break;