From 09839aa198133947175a9c7879e6a7c34c4404b4 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Tue, 5 Mar 2024 08:21:26 -0800 Subject: [PATCH] multi_manager: Minor clean up. --- src/gs-entbase/server/multi_manager.qc | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/gs-entbase/server/multi_manager.qc b/src/gs-entbase/server/multi_manager.qc index 4d894636..6506e2db 100644 --- a/src/gs-entbase/server/multi_manager.qc +++ b/src/gs-entbase/server/multi_manager.qc @@ -41,6 +41,7 @@ public: /* overrides */ virtual void Save(float); virtual void Restore(string,string); + nonvirtual void ActivateSub(void); private: entity m_eActivator; @@ -83,6 +84,13 @@ multi_manager_sub::Restore(string strKey, string strValue) } } +void +multi_manager_sub::ActivateSub(void) +{ + m_iValue = TRUE; + UseTargets(m_eActivator, TRIG_TOGGLE, 0.0f); +} + class multi_manager:NSPointTrigger { @@ -289,18 +297,6 @@ multi_manager::Respawn(void) void multi_manager::Trigger(entity act, triggermode_t state) { - static void mm_enttrigger (void) { - multi_manager_sub wow = (multi_manager_sub)self; - - entity eFind = find(world, ::targetname, wow.target); - - EntLog("Triggering %S (%S)", - wow.target, eFind.classname); - - wow.m_iValue = TRUE; - UseTargets(wow.m_eActivator, TRIG_TOGGLE, 0.0f); - } - if (GetMaster(act) == FALSE) return; @@ -322,6 +318,6 @@ multi_manager::Trigger(entity act, triggermode_t state) m_eTriggers[i].m_iValue = FALSE; m_eTriggers[i].m_eActivator = act; - m_eTriggers[i].ScheduleThink(mm_enttrigger, m_eTriggers[i].m_flUntilTriggered); + m_eTriggers[i].ScheduleThink(multi_manager_sub::ActivateSub, m_eTriggers[i].m_flUntilTriggered); } }