From ce86ebbd52b0e9e2f40436d670dc02b65f2f4110 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Wed, 13 Sep 2023 18:06:15 +0100
Subject: [PATCH] Add "GrandPrix" check function to ACS

Resolves #669
Done in this branch to keep ACS changes together
---
 src/acs/call-funcs.cpp  | 16 ++++++++++++++++
 src/acs/call-funcs.hpp  |  1 +
 src/acs/environment.cpp |  1 +
 3 files changed, 18 insertions(+)

diff --git a/src/acs/call-funcs.cpp b/src/acs/call-funcs.cpp
index 24170bf41..6594d4840 100644
--- a/src/acs/call-funcs.cpp
+++ b/src/acs/call-funcs.cpp
@@ -40,6 +40,7 @@
 #include "../m_cond.h"
 #include "../r_skins.h"
 #include "../k_battle.h"
+#include "../k_grandprix.h"
 #include "../k_podium.h"
 #include "../k_bot.h"
 #include "../z_zone.h"
@@ -1699,6 +1700,21 @@ bool CallFunc_TimeAttack(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::
 	return false;
 }
 
+/*--------------------------------------------------
+	bool CallFunc_GrandPrix(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
+
+		Returns if a Grand Prix is active.
+--------------------------------------------------*/
+bool CallFunc_GrandPrix(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
+{
+	(void)argV;
+	(void)argC;
+
+	thread->dataStk.push(grandprixinfo.gp);
+	return false;
+}
+
+
 /*--------------------------------------------------
 	bool CallFunc_PodiumPosition(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC)
 
diff --git a/src/acs/call-funcs.hpp b/src/acs/call-funcs.hpp
index 48ce72e84..39bf5adf8 100644
--- a/src/acs/call-funcs.hpp
+++ b/src/acs/call-funcs.hpp
@@ -81,6 +81,7 @@ bool CallFunc_LowestLap(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::W
 bool CallFunc_EncoreMode(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC);
 bool CallFunc_BreakTheCapsules(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC);
 bool CallFunc_TimeAttack(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC);
+bool CallFunc_GrandPrix(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC);
 
 bool CallFunc_PodiumPosition(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC);
 bool CallFunc_PodiumFinish(ACSVM::Thread *thread, const ACSVM::Word *argV, ACSVM::Word argC);
diff --git a/src/acs/environment.cpp b/src/acs/environment.cpp
index ad0c3e106..9fba26211 100644
--- a/src/acs/environment.cpp
+++ b/src/acs/environment.cpp
@@ -165,6 +165,7 @@ Environment::Environment()
 	addFuncDataACS0( 310, addCallFunc(CallFunc_BreakTheCapsules));
 	addFuncDataACS0( 311, addCallFunc(CallFunc_TimeAttack));
 	addFuncDataACS0( 312, addCallFunc(CallFunc_ThingCount));
+	addFuncDataACS0( 313, addCallFunc(CallFunc_GrandPrix));
 
 	addFuncDataACS0( 500, addCallFunc(CallFunc_CameraWait));
 	addFuncDataACS0( 501, addCallFunc(CallFunc_PodiumPosition));