X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Frelay.qc;h=e5d0018032de0f67c63fc4ce91c5d5eaed56314a;hb=8d34d5c14d4b5909e682f57c8a777ca979bf18b3;hp=20962cd495d9de4cc3ce25eb4a30e396db6e16f3;hpb=5b22584122d4354ab7819853d0fa5219d14d832e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/trigger/relay.qc b/qcsrc/common/triggers/trigger/relay.qc
index 20962cd49..e5d001803 100644
--- a/qcsrc/common/triggers/trigger/relay.qc
+++ b/qcsrc/common/triggers/trigger/relay.qc
@@ -1,10 +1,23 @@
+#include "relay.qh"
 #ifdef SVQC
+
+void relay_use(entity this, entity actor, entity trigger)
+{
+	if(this.active != ACTIVE_ACTIVE)
+		return;
+
+	SUB_UseTargets(this, actor, trigger);
+}
+
 /*QUAKED spawnfunc_trigger_relay (.5 .5 .5) (-8 -8 -8) (8 8 8)
 This fixed size trigger cannot be touched, it can only be fired by other events.  It can contain killtargets, targets, delays, and messages.
 */
-void spawnfunc_trigger_relay()
-{SELFPARAM();
-	self.use = SUB_UseTargets;
-	self.reset = spawnfunc_trigger_relay; // this spawnfunc resets fully
+spawnfunc(trigger_relay)
+{
+	this.active = ACTIVE_ACTIVE;
+	this.use = relay_use;
+	this.reset = spawnfunc_trigger_relay; // this spawnfunc resets fully
 }
+
+spawnfunc(target_relay) { spawnfunc_trigger_relay(this); }
 #endif