From a568042934b5f717a28812945ab14a6af86fab15 Mon Sep 17 00:00:00 2001
From: ineedbots <ineedbots@outlook.com>
Date: Mon, 14 Jun 2021 13:22:12 -0600
Subject: [PATCH] Abstract class choice

---
 main_shared/maps/mp/bots/_bot_script.gsc  |  4 ++--
 main_shared/maps/mp/bots/_bot_utility.gsc | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index aa691e5..7a3098f 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -233,7 +233,7 @@ classWatch()
 
 	for(;;)
 	{
-		while(!isdefined(self.pers["team"]) || level.oldschool)
+		while(!isdefined(self.pers["team"]) || !allowClassChoice())
 			wait .05;
 			
 		wait 0.5;
@@ -256,7 +256,7 @@ teamWatch()
 
 	for(;;)
 	{
-		while(!isdefined(self.pers["team"]))
+		while(!isdefined(self.pers["team"]) || !allowTeamChoice())
 			wait .05;
 			
 		wait 0.05;
diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc
index 8c8721d..a4b8c1e 100644
--- a/main_shared/maps/mp/bots/_bot_utility.gsc
+++ b/main_shared/maps/mp/bots/_bot_utility.gsc
@@ -489,6 +489,22 @@ waittill_either(not, not1)
 	self waittill(not1);
 }
 
+/*
+	iw5
+*/
+allowClassChoice()
+{
+	return true;
+}
+
+/*
+	iw5
+*/
+allowTeamChoice()
+{
+	return true;
+}
+
 /*
 	Taken from iw4 script
 */