From 43c7bcc03ba58cca278834fad2c34a60e9beca06 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Fri, 26 Jan 2024 20:52:33 -0800
Subject: [PATCH] Removal of "bot_add" command. Add zpak001.pk3dir/def/bot.def

---
 src/server/bot.qc          |  8 ++++++--
 src/server/gamerules.qc    | 18 ------------------
 zpak001.pk3dir/def/bot.def |  4 ++++
 3 files changed, 10 insertions(+), 20 deletions(-)
 create mode 100644 zpak001.pk3dir/def/bot.def

diff --git a/src/server/bot.qc b/src/server/bot.qc
index db24066..f0758b3 100644
--- a/src/server/bot.qc
+++ b/src/server/bot.qc
@@ -1,15 +1,19 @@
 class
-TFCBot:bot
+TFCBot:NSBot
 {
 	void TFCBot(void);
 
 	//virtual void CreateObjective(void);
 };
 
+void CSEv_TeamJoin_f(float f);
+void CSEv_ClassJoin_f(float f);
+
 void
 TFCBot::TFCBot(void)
 {
-
+	CSEv_TeamJoin_f(0);
+	CSEv_ClassJoin_f(0);
 }
 
 #if 0
diff --git a/src/server/gamerules.qc b/src/server/gamerules.qc
index b6f7e9e..80a8335 100644
--- a/src/server/gamerules.qc
+++ b/src/server/gamerules.qc
@@ -14,17 +14,6 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-void CSEv_TeamJoin_f(float f);
-void CSEv_ClassJoin_f(float f);
-
-void
-TFCGameRules_BotJoin(void)
-{
-	spawnfunc_TFCBot();
-	CSEv_TeamJoin_f(0);
-	CSEv_ClassJoin_f(0);
-}
-
 void
 TFCGameRules::TFCGameRules(void)
 {
@@ -46,13 +35,6 @@ TFCGameRules::ConsoleCommand(NSClientPlayer pp, string cmd)
 	tokenize(cmd);
 
 	switch (argv(0)) {
-	case "bot_add":
-		entity bot_ent = Bot_AddQuick();
-		if (bot_ent) {
-			bot_ent.think = TFCGameRules_BotJoin;
-			bot_ent.nextthink = time;
-		}
-		break;
 	default:
 		return (false);
 	}
diff --git a/zpak001.pk3dir/def/bot.def b/zpak001.pk3dir/def/bot.def
new file mode 100644
index 0000000..4bcbcda
--- /dev/null
+++ b/zpak001.pk3dir/def/bot.def
@@ -0,0 +1,4 @@
+entityDef bot
+{
+	spawnclass TFCBot
+}
\ No newline at end of file