From 70bb77d2bbfb876f3e0893edd3c324b0e48509bb Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Thu, 28 Sep 2023 21:35:06 -0700
Subject: [PATCH] trigger_changelevel/logic_auto: avoid use of the 'readcmd'
 builtin.

---
 src/gs-entbase/server/logic_auto.qc          |  2 +-
 src/gs-entbase/server/trigger_changelevel.qc | 10 +++++-----
 src/shared/NSTrigger.qc                      |  1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/gs-entbase/server/logic_auto.qc b/src/gs-entbase/server/logic_auto.qc
index d05b0963..72ce7d8e 100644
--- a/src/gs-entbase/server/logic_auto.qc
+++ b/src/gs-entbase/server/logic_auto.qc
@@ -217,7 +217,7 @@ logic_auto::Processing(void)
 			/* set by trigger_changelevel, however not by the changelevel cmd */
 			if (cvar("_bsp_change_auto") == 1) {
 				UseOutput(this, m_strOnMapTransition);
-				readcmd("set _bsp_change_auto \"\"\n");
+				cvar_set("_bsp_change_auto", "");
 			} else
 				UseOutput(this, m_strOnLoadGame);
 		} else
diff --git a/src/gs-entbase/server/trigger_changelevel.qc b/src/gs-entbase/server/trigger_changelevel.qc
index 6ccf3037..d57f9b86 100644
--- a/src/gs-entbase/server/trigger_changelevel.qc
+++ b/src/gs-entbase/server/trigger_changelevel.qc
@@ -70,8 +70,8 @@ ChangeTarget_Activate(void)
 				t.Trigger(self, TRIG_TOGGLE);
 		}
 
-		readcmd("set _bsp_changetarget \"\"\n");
-		readcmd("set _bsp_changedelay \"\"\n");
+		cvar_set("_bsp_changetarget", "");
+		cvar_set("_bsp_changedelay", "");
 	}
 
 	if not (ctarg)
@@ -222,7 +222,7 @@ void
 trigger_changelevel::Change(void)
 {
 	/* needed for logic_auto */
-	readcmd("set _bsp_change_auto \"1\"\n");
+	cvar_set("_bsp_change_auto", "1");
 
 	/* standard level change */
 	if (!m_strLandmark) {
@@ -287,8 +287,8 @@ trigger_changelevel::Trigger(entity act, triggermode_t unused)
 	/* eActivator == player who triggered the damn thing */
 	m_activator = act;
 
-	readcmd(sprintf("set _bsp_changetarget %S\n", m_strChangeTarget));
-	readcmd(sprintf("set _bsp_changedelay %f\n", m_flChangeDelay));
+	cvar_set("_bsp_changetarget", m_strChangeTarget);
+	cvar_set("_bsp_changedelay", ftos(m_flChangeDelay));
 
 	Change();
 }
diff --git a/src/shared/NSTrigger.qc b/src/shared/NSTrigger.qc
index bfa3bf68..4b43d5d2 100644
--- a/src/shared/NSTrigger.qc
+++ b/src/shared/NSTrigger.qc
@@ -75,7 +75,6 @@ NSTrigger::CanBeTriggeredBy(entity testEnt)
 void
 NSTrigger::Trigger(entity act, triggermode_t state)
 {
-	breakpoint();
 	NSLog("^2%s::^3Trigger^7: Triggered by %s with no consequence", 
 		classname, act.classname);
 }