From 0a9e2a6aaf32efc6fbd3a671a7f6adb1d0923076 Mon Sep 17 00:00:00 2001
From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 3 May 2010 16:29:35 +0300
Subject: [PATCH] Use div0's idea for untouch detection.

---
 qcsrc/server/g_triggers.qc | 51 +++++++++++++++++++-------------------
 scripts/entities.def       |  4 +--
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 33f1a5624..5254b9fec 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -533,48 +533,47 @@ void spawnfunc_trigger_heal()
 //
 //////////////////////////////////////////////////////////////
 
-.float triggergravity, triggergravitytime, oldgravity;
+.float triggergravity, oldgravity;
 .entity trigger_gravity_check;
 void trigger_gravity_check_think()
 {
-	// Entity that spawns when you enter a gravity zone, and checks if you left it
-	if(self.owner.triggergravitytime < time - 0.1) // need to figure out a correct formula here
+	// This spawns when a player enters the gravity zone and checks if he left.
+	// Each frame, self.cnt 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.cnt <= 0)
 	{
-		dprint("XXXXXXXXXXXXXXXXXXXXXXXXXX ");
+		dprint("XXXXXXXXXXXXXXXXXXXXXXXXXX "); // temporary execution test
 		self.owner.gravity = self.owner.oldgravity;
 		self.owner.triggergravity = 0;
 		remove(self);
 	}
 	else
+	{
+		self.cnt -= 1;
 		self.nextthink = time;
+	}
 }
 
 void trigger_gravity_touch()
 {
-	if(sv_gravity != 800)
-		return;
-	// only do the EXACTTRIGGER_TOUCH checks when really needed (saves some cpu)
-	if (other.triggergravitytime < time)
-	{
-		EXACTTRIGGER_TOUCH;
-		other.triggergravitytime = time + 0.1;
+	EXACTTRIGGER_TOUCH;
 
-		if(!other.triggergravity)
-		{
-			other.triggergravity = 1;
-			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;
-		}
+	if(!other.triggergravity)
+	{
+		other.triggergravity = 1;
+		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;
 
-		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);
-		}
+	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);
 	}
 };
 
diff --git a/scripts/entities.def b/scripts/entities.def
index e5f1d8349..09022ba67 100644
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -1776,8 +1776,8 @@ target: must point to a target_position
 */
 
 /*QUAKED trigger_gravity (.5 .5 .5) ?
-An area in which gravity differs from the rest of the map. Only works if the gravity mutator is inactive (sv_gravity is set to default)
-This acts as a modifier from the normal gravity. eg: 0.5 is half of the normal gravity, 2 is twice the normal gravity.
+An area where gravity differs from the rest of the map.
+This acts as a modifier from the normal gravity (sv_gravity). eg: 0.5 is half of the normal gravity, 2 is twice the normal gravity.
 -------- KEYS --------
 gravity: the gravity in this area
 noise: sound file to play when an entity enters this, leave empty to disable
-- 
2.39.2