]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use an .olgravity rather than 0. Set the timers to 0.1 again for now.
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 3 May 2010 11:46:42 +0000 (14:46 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 3 May 2010 11:46:42 +0000 (14:46 +0300)
qcsrc/server/g_triggers.qc

index a4111954fd8f2c6dac5c7118f478f66e4f90cb2a..7ee0b37c49d90a46b68a171fd2c0346b2031ce40 100644 (file)
@@ -533,15 +533,15 @@ void spawnfunc_trigger_heal()
 //
 //////////////////////////////////////////////////////////////
 
-.float triggergravity, triggergravitytime;
+.float triggergravity, triggergravitytime, 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.01) // need to figure out a correct formula here
+       if(self.owner.triggergravitytime < time - 0.1) // need to figure out a correct formula here
        {
                dprint("XXXXXXXXXXXXXXXXXXXXXXXXXX ");
-               self.owner.gravity = 0;
+               self.owner.gravity = self.owner.oldgravity;
                self.owner.triggergravity = 0;
                remove(self);
        }
@@ -557,7 +557,7 @@ void trigger_gravity_touch()
        if (other.triggergravitytime < time)
        {
                EXACTTRIGGER_TOUCH;
-               other.triggergravitytime = time + 0.01;
+               other.triggergravitytime = time + 0.1;
 
                if(!other.triggergravity)
                {
@@ -570,6 +570,7 @@ 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);