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=83c0103d09fe4ad2a2d61eaad361e49c48ac0e98;hb=bf28c62f9ad2f130024109354c2503457195898d;hpb=1e85850478a0174700ab365d6a642a2a420d78f8

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