Merge branch 'next' of https://github.com/MegaMech/SpaghettiKart into next

1 files changed, 6 insertions, 2 deletions

diff --git a/src/engine/vehicles/Bus.cpp b/src/engine/vehicles/Bus.cpp
index 36bb576c6..c8b81b4c5 100644
--- a/src/engine/vehicles/Bus.cpp
+++ b/src/engine/vehicles/Bus.cpp
@@ -16,12 +16,14 @@ extern "C" {
 extern s8 gPlayerCount;
 }
 
-ABus::ABus(size_t idx, f32 speedA, f32 speedB, TrackWaypoint* path, uint32_t waypoint) {
+size_t ABus::_count = 0;
+
+ABus::ABus(f32 speedA, f32 speedB, TrackWaypoint* path, uint32_t waypoint) {
     TrackWaypoint* temp_v0;
     u16 waypointOffset;
     s32 numWaypoints = gWaypointCountByPathIndex[0];
 
-    Index = idx;
+    Index = _count;
 
     waypointOffset = waypoint;
     temp_v0 = &path[waypointOffset];
@@ -54,6 +56,8 @@ ABus::ABus(size_t idx, f32 speedA, f32 speedB, TrackWaypoint* path, uint32_t way
             func_8000D940(Position, (s16*) &WaypointIndex, Speed, SomeMultiplierTheSequel, 0);
     }
     D_801631C8 = 10;
+
+    _count++;
 }
 
 void ABus::Spawn() {