From 6ff80c5f08c0a9c4e57ec419d4e6dcd781bb5b45 Mon Sep 17 00:00:00 2001
From: MegaMech <7255464+MegaMech@users.noreply.github.com>
Date: Thu, 22 May 2025 07:04:45 -0600
Subject: Some fixes for battle mode

---
 src/port/Game.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/port/Game.cpp')

diff --git a/src/port/Game.cpp b/src/port/Game.cpp
index 2c0ec3a0a..33b4e9d16 100644
--- a/src/port/Game.cpp
+++ b/src/port/Game.cpp
@@ -244,6 +244,10 @@ u32 GetCupIndex(void) {
     return gWorldInstance.GetCupIndex();
 }
 
+void CM_SetCupIndex(size_t index) {
+    gWorldInstance.SetCupIndex(index);
+}
+
 const char* GetCupName(void) {
     return gWorldInstance.CurrentCup->Name;
 }
@@ -394,10 +398,11 @@ void CM_BeginPlay() {
 
     if (course) {
         // Do not spawn finishline in credits or battle mode. And if bSpawnFinishline.
-        if ((gGamestate != CREDITS_SEQUENCE) && (gGamestate != BATTLE) && (course->bSpawnFinishline)) {
-            gWorldInstance.AddActor(new AFinishline(course->FinishlineSpawnPoint));
+        if ((gGamestate != CREDITS_SEQUENCE) && (gModeSelection != BATTLE)) {
+            if (course->bSpawnFinishline) {
+                gWorldInstance.AddActor(new AFinishline(course->FinishlineSpawnPoint));
+            }
         }
-
         gEditor.AddLight("Sun", nullptr, D_800DC610[1].l->l.dir);
 
         course->BeginPlay();
-- 
cgit v1.2.3