vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

trigger_changelevel/logic_auto: avoid use of the 'readcmd' builtin.

Browse source
This commit is contained in:
Marco Cawthorne 2023-09-28 21:35:06 -07:00
parent 2fb002aab1
commit 70bb77d2bb
Signed by: eukara
GPG key ID: CE2032F0A2882A22
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gs-entbase/server/logic_auto.qc
View file

@ -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

10
src/gs-entbase/server/trigger_changelevel.qc
View file

@ -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();
}

1
src/shared/NSTrigger.qc
View file

@ -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);
}