Fix #4926

Also add more explicit error logging for this case.
supertuxkart · Nov 12, 2023 · 858ed6b · 858ed6b
1 parent 8cd6a23
commit 858ed6b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/modes/world.cpp b/src/modes/world.cpp
@@ -476,6 +476,11 @@ std::shared_ptr<AbstractKart> World::createKart
     }
 
     int position           = index+1;
+
+    if (index - gk < 0)
+        Log::error("World",
+            "Attempt to create a kart with a ghost_kart index.");
+
     btTransform init_pos   = getStartTransform(index - gk);
     std::shared_ptr<AbstractKart> new_kart;
     if (RewindManager::get()->isEnabled())

diff --git a/src/race/race_manager.cpp b/src/race/race_manager.cpp
@@ -600,6 +600,7 @@ void RaceManager::startNextRace()
     else
     {
         const bool random_pos_available = !NetworkConfig::get()->isNetworking() &&
+            !m_has_ghost_karts &&
             (RaceManager::get()->getMinorMode() == RaceManager::MINOR_MODE_NORMAL_RACE
             || RaceManager::get()->getMinorMode() == RaceManager::MINOR_MODE_TIME_TRIAL
             || RaceManager::get()->getMinorMode() == RaceManager::MINOR_MODE_FOLLOW_LEADER);