X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Frelay_activators.qc;h=dabbbd2d96b05acad53b2ee499377b7dc6383d6a;hp=b765151fd123faa685786bb3f3f66b1b4730ecab;hb=bf28c62f9ad2f130024109354c2503457195898d;hpb=3a035cb2732af064519135410c5664c2e1b3f501

diff --git a/qcsrc/common/triggers/trigger/relay_activators.qc b/qcsrc/common/triggers/trigger/relay_activators.qc
index b765151fd..dabbbd2d9 100644
--- a/qcsrc/common/triggers/trigger/relay_activators.qc
+++ b/qcsrc/common/triggers/trigger/relay_activators.qc
@@ -1,11 +1,10 @@
 #ifdef SVQC
-void relay_activators_use()
-{SELFPARAM();
+void relay_activators_use(entity this, entity actor, entity trigger)
+{
 	for(entity trg = world; (trg = find(trg, targetname, this.target)); )
 	{
-		setself(trg);
 		if (trg.setactive)
-			trg.setactive(this.cnt);
+			trg.setactive(trg, this.cnt);
 		else
 		{
 			//bprint("Not using setactive\n");
@@ -18,24 +17,23 @@ void relay_activators_use()
 				trg.active = this.cnt;
 		}
 	}
-	setself(this);
 }
 
-void spawnfunc_relay_activate()
-{SELFPARAM();
-	self.cnt = ACTIVE_ACTIVE;
-	self.use = relay_activators_use;
+spawnfunc(relay_activate)
+{
+	this.cnt = ACTIVE_ACTIVE;
+	this.use = relay_activators_use;
 }
 
-void spawnfunc_relay_deactivate()
-{SELFPARAM();
-	self.cnt = ACTIVE_NOT;
-	self.use = relay_activators_use;
+spawnfunc(relay_deactivate)
+{
+	this.cnt = ACTIVE_NOT;
+	this.use = relay_activators_use;
 }
 
-void spawnfunc_relay_activatetoggle()
-{SELFPARAM();
-	self.cnt = ACTIVE_TOGGLE;
-	self.use = relay_activators_use;
+spawnfunc(relay_activatetoggle)
+{
+	this.cnt = ACTIVE_TOGGLE;
+	this.use = relay_activators_use;
 }
 #endif