From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 3 May 2010 13:39:22 +0000 (+0300)
Subject: Set gravity to 0 again rather than using oldgravity. Otherwise going from one gravity... 
X-Git-Tag: xonotic-v0.1.0preview~640^2~11^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b97c53b25d1b3fa7886e0364e295739f68faf87;p=xonotic%2Fxonotic-data.pk3dir.git

Set gravity to 0 again rather than using oldgravity. Otherwise going from one gravity zone to another can cause you to get stuck with the previous zone's gravity, if that's seen as the old one.
---

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 5254b9fec..241d30164 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -533,7 +533,7 @@ void spawnfunc_trigger_heal()
 //
 //////////////////////////////////////////////////////////////
 
-.float triggergravity, oldgravity;
+.float triggergravity;
 .entity trigger_gravity_check;
 void trigger_gravity_check_think()
 {
@@ -543,7 +543,7 @@ void trigger_gravity_check_think()
 	if(self.cnt <= 0)
 	{
 		dprint("XXXXXXXXXXXXXXXXXXXXXXXXXX "); // temporary execution test
-		self.owner.gravity = self.owner.oldgravity;
+		self.owner.gravity = 0;
 		self.owner.triggergravity = 0;
 		remove(self);
 	}
@@ -570,7 +570,6 @@ void trigger_gravity_touch()
 
 	if (other.gravity != self.gravity)
 	{
-		other.oldgravity = other.gravity;
 		other.gravity = self.gravity;
 		if(self.noise != "")
 			sound (other, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NORM);