add "keep !activator" flag to trigger_relay

wootguy · Sep 14, 2024 · ca1c1fd · ca1c1fd
1 parent 1177fc8
commit ca1c1fd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/dlls/triggers/CTriggerRelay.cpp b/dlls/triggers/CTriggerRelay.cpp
@@ -3,6 +3,7 @@
 #include "cbase.h"
 
 #define SF_RELAY_FIREONCE		0x0001
+#define SF_RELAY_KEEP_ACTIVATOR		64
 
 class CTriggerRelay : public CBaseDelay
 {
@@ -60,7 +61,9 @@ void CTriggerRelay::Spawn(void)
 
 void CTriggerRelay::Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE useType, float value)
 {
-	SUB_UseTargets(this, triggerType, 0);
+	CBaseEntity* activator = (pev->spawnflags & SF_RELAY_KEEP_ACTIVATOR) ? pActivator : this;
+
+	SUB_UseTargets(activator, triggerType, 0);
 	if (pev->spawnflags & SF_RELAY_FIREONCE)
 		UTIL_Remove(this);
 }