X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ffunc%2Ffourier.qc;h=53366aa1054dcde093ec130031ee5a579ce86c60;hp=552fffe5a11deae6142a74b2e82a71bd0a4fe72c;hb=cf1edea8694548556934b5b05f526bc192f576cb;hpb=18302817d7f0cb0ba74398200da5e400ffc1b9a4

diff --git a/qcsrc/common/triggers/func/fourier.qc b/qcsrc/common/triggers/func/fourier.qc
index 552fffe5a..53366aa10 100644
--- a/qcsrc/common/triggers/func/fourier.qc
+++ b/qcsrc/common/triggers/func/fourier.qc
@@ -10,8 +10,8 @@ dmg: Do this mutch dmg every .dmgtime intervall when blocked
 dmgtime: See above.
 */
 
-void func_fourier_controller_think()
-{SELFPARAM();
+void func_fourier_controller_think(entity this)
+{
 	vector v;
 	float n, i, t;
 
@@ -39,50 +39,49 @@ void func_fourier_controller_think()
 		self.owner.velocity = (v - self.owner.origin) * 10;
 }
 
-void spawnfunc_func_fourier()
-{SELFPARAM();
+spawnfunc(func_fourier)
+{
 	entity controller;
-	if (self.noise != "")
+	if (this.noise != "")
 	{
-		precache_sound(self.noise);
-		soundto(MSG_INIT, self, CH_TRIGGER_SINGLE, self.noise, VOL_BASE, ATTEN_IDLE);
+		precache_sound(this.noise);
+		soundto(MSG_INIT, this, CH_TRIGGER_SINGLE, this.noise, VOL_BASE, ATTEN_IDLE);
 	}
 
-	if (!self.speed)
-		self.speed = 4;
-	if (!self.height)
-		self.height = 32;
-	self.destvec = self.origin;
-	self.cnt = 360 / self.speed;
-
-	self.blocked = generic_plat_blocked;
-	if(self.dmg && (self.message == ""))
-		self.message = " was squished";
-    if(self.dmg && (self.message2 == ""))
-		self.message2 = "was squished by";
-	if(self.dmg && (!self.dmgtime))
-		self.dmgtime = 0.25;
-	self.dmgtime2 = time;
-
-	if(self.netname == "")
-		self.netname = "1 0 0 0 1";
-
-	if (!InitMovingBrushTrigger())
+	if (!this.speed)
+		this.speed = 4;
+	if (!this.height)
+		this.height = 32;
+	this.destvec = this.origin;
+	this.cnt = 360 / this.speed;
+
+	this.blocked = generic_plat_blocked;
+	if(this.dmg && (this.message == ""))
+		this.message = " was squished";
+    if(this.dmg && (this.message2 == ""))
+		this.message2 = "was squished by";
+	if(this.dmg && (!this.dmgtime))
+		this.dmgtime = 0.25;
+	this.dmgtime2 = time;
+
+	if(this.netname == "")
+		this.netname = "1 0 0 0 1";
+
+	if (!InitMovingBrushTrigger(this))
 		return;
 
-	self.active = ACTIVE_ACTIVE;
+	this.active = ACTIVE_ACTIVE;
 
 	// wait for targets to spawn
-	controller = spawn();
-	controller.classname = "func_fourier_controller";
-	controller.owner = self;
+	controller = new(func_fourier_controller);
+	controller.owner = this;
 	controller.nextthink = time + 1;
-	controller.think = func_fourier_controller_think;
-	self.SUB_NEXTTHINK = self.SUB_LTIME + 999999999;
-	self.SUB_THINK = SUB_NullThink; // for PushMove
+	setthink(controller, func_fourier_controller_think);
+	this.SUB_NEXTTHINK = this.SUB_LTIME + 999999999;
+	SUB_THINK(this, SUB_NullThink); // for PushMove
 
 	// Savage: Reduce bandwith, critical on e.g. nexdm02
-	self.effects |= EF_LOWPRECISION;
+	this.effects |= EF_LOWPRECISION;
 
 	// TODO make a reset function for this one
 }