X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fgravity.qc;h=3ea1562f084a93e4c73b7fdb0c9a26ac64dad90e;hb=d492869ab1f18e05121529b7bcffcb637d13994c;hp=f2f8a845f12fd836d849d83875ce9eaac9a16e3c;hpb=1add7fc6b9e512dcfcfd3180505046449ac782cd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/trigger/gravity.qc b/qcsrc/common/triggers/trigger/gravity.qc
index f2f8a845f..3ea1562f0 100644
--- a/qcsrc/common/triggers/trigger/gravity.qc
+++ b/qcsrc/common/triggers/trigger/gravity.qc
@@ -1,3 +1,4 @@
+#include "gravity.qh"
 #ifdef SVQC
 .entity trigger_gravity_check;
 void trigger_gravity_remove(entity own)
@@ -6,29 +7,29 @@ void trigger_gravity_remove(entity own)
 	{
 		UpdateCSQCProjectile(own);
 		own.gravity = own.trigger_gravity_check.gravity;
-		remove(own.trigger_gravity_check);
+		delete(own.trigger_gravity_check);
 	}
 	else
 		backtrace("Removing a trigger_gravity_check with no valid owner");
-	own.trigger_gravity_check = world;
+	own.trigger_gravity_check = NULL;
 }
-void trigger_gravity_check_think()
-{SELFPARAM();
+void trigger_gravity_check_think(entity this)
+{
 	// This spawns when a player enters the gravity zone and checks if he left.
-	// Each frame, self.count is set to 2 by trigger_gravity_touch() and decreased by 1 here.
+	// Each frame, this.count is set to 2 by trigger_gravity_touch() and decreased by 1 here.
 	// It the player has left the gravity trigger, this will be allowed to reach 0 and indicate that.
-	if(self.count <= 0)
+	if(this.count <= 0)
 	{
-		if(self.owner.trigger_gravity_check == self)
-			trigger_gravity_remove(self.owner);
+		if(this.owner.trigger_gravity_check == this)
+			trigger_gravity_remove(this.owner);
 		else
-			remove(self);
+			delete(this);
 		return;
 	}
 	else
 	{
-		self.count -= 1;
-		self.nextthink = time;
+		this.count -= 1;
+		this.nextthink = time;
 	}
 }
 
@@ -37,51 +38,51 @@ void trigger_gravity_use(entity this, entity actor, entity trigger)
 	this.state = !this.state;
 }
 
-void trigger_gravity_touch()
-{SELFPARAM();
+void trigger_gravity_touch(entity this, entity toucher)
+{
 	float g;
 
-	if(self.state != true)
+	if(this.state != true)
 		return;
 
-	EXACTTRIGGER_TOUCH;
+	EXACTTRIGGER_TOUCH(this, toucher);
 
-	g = self.gravity;
+	g = this.gravity;
 
-	if (!(self.spawnflags & 1))
+	if (!(this.spawnflags & 1))
 	{
-		if(other.trigger_gravity_check)
+		if(toucher.trigger_gravity_check)
 		{
-			if(self == other.trigger_gravity_check.enemy)
+			if(this == toucher.trigger_gravity_check.enemy)
 			{
 				// same?
-				other.trigger_gravity_check.count = 2; // gravity one more frame...
+				toucher.trigger_gravity_check.count = 2; // gravity one more frame...
 				return;
 			}
 
 			// compare prio
-			if(self.cnt > other.trigger_gravity_check.enemy.cnt)
-				trigger_gravity_remove(other);
+			if(this.cnt > toucher.trigger_gravity_check.enemy.cnt)
+				trigger_gravity_remove(toucher);
 			else
 				return;
 		}
-		other.trigger_gravity_check = spawn();
-		other.trigger_gravity_check.enemy = self;
-		other.trigger_gravity_check.owner = other;
-		other.trigger_gravity_check.gravity = other.gravity;
-		other.trigger_gravity_check.think = trigger_gravity_check_think;
-		other.trigger_gravity_check.nextthink = time;
-		other.trigger_gravity_check.count = 2;
-		if(other.gravity)
-			g *= other.gravity;
+		toucher.trigger_gravity_check = spawn();
+		toucher.trigger_gravity_check.enemy = this;
+		toucher.trigger_gravity_check.owner = toucher;
+		toucher.trigger_gravity_check.gravity = toucher.gravity;
+		setthink(toucher.trigger_gravity_check, trigger_gravity_check_think);
+		toucher.trigger_gravity_check.nextthink = time;
+		toucher.trigger_gravity_check.count = 2;
+		if(toucher.gravity)
+			g *= toucher.gravity;
 	}
 
-	if (other.gravity != g)
+	if (toucher.gravity != g)
 	{
-		other.gravity = g;
-		if(self.noise != "")
-			_sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTEN_NORM);
-		UpdateCSQCProjectile(self.owner);
+		toucher.gravity = g;
+		if(this.noise != "")
+			_sound (toucher, CH_TRIGGER, this.noise, VOL_BASE, ATTEN_NORM);
+		UpdateCSQCProjectile(this.owner);
 	}
 }