From: Rudolf Polzer <divVerent@alientrap.org>
Date: Sat, 8 May 2010 13:07:48 +0000 (+0200)
Subject: gravity trigger: save the old gravity, restore it, and MULTIPLY by the gravity of... 
X-Git-Tag: xonotic-v0.1.0preview~640^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f2ae837d0e962f61733e2a64f1e60ed792270cf;p=xonotic%2Fxonotic-data.pk3dir.git

gravity trigger: save the old gravity, restore it, and MULTIPLY by the gravity of the trigger (not sure if this would currently affect anything)
---

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 0bd56b048..9c10e38a9 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -533,7 +533,6 @@ void spawnfunc_trigger_heal()
 //
 //////////////////////////////////////////////////////////////
 
-.float trigger_gravity_active;
 .entity trigger_gravity_check;
 void trigger_gravity_check_think()
 {
@@ -542,8 +541,9 @@ void trigger_gravity_check_think()
 	// It the player has left the gravity trigger, this will be allowed to reach 0 and indicate that.
 	if(self.cnt <= 0)
 	{
-		self.owner.gravity = 1;
-		self.owner.trigger_gravity_active = FALSE;
+		UpdateCSQCProjectile(self.owner);
+		self.owner.gravity = self.gravity;
+		self.owner.trigger_gravity_check = world;
 		remove(self);
 	}
 	else
@@ -560,29 +560,38 @@ void trigger_gravity_use()
 
 void trigger_gravity_touch()
 {
+	float g;
+
 	if(self.state != TRUE)
 		return;
 
 	EXACTTRIGGER_TOUCH;
 
+	g = self.gravity;
+
 	if not(self.spawnflags & 1)
 	{
-		if(!other.trigger_gravity_active)
+		if(other.trigger_gravity_check)
 		{
-			other.trigger_gravity_active = TRUE;
-			other.trigger_gravity_check = spawn();
-			other.trigger_gravity_check.owner = other;
-			other.trigger_gravity_check.think = trigger_gravity_check_think;
-			other.trigger_gravity_check.nextthink = time;
+			other.trigger_gravity_check.cnt = 2; // gravity one more frames...
+			return;
 		}
+		other.trigger_gravity_check = spawn();
+		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.cnt = 2;
+		if(other.gravity)
+			g *= other.gravity;
 	}
 
-	if (other.gravity != self.gravity)
+	if (other.gravity != g)
 	{
-		other.gravity = self.gravity;
+		other.gravity = g;
 		if(self.noise != "")
 			sound (other, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NORM);
+		UpdateCSQCProjectile(self.owner);
 	}
 };