]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Name and comment optimizations. Remove test code.
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 3 May 2010 13:50:06 +0000 (16:50 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 3 May 2010 13:50:06 +0000 (16:50 +0300)
qcsrc/server/g_triggers.qc
scripts/entities.def

index 241d30164a72b8247564c6c6bd0117d0d27353b3..73b01901254ba450ee96480259d5e8e7bdb9d1db 100644 (file)
@@ -533,7 +533,7 @@ void spawnfunc_trigger_heal()
 //
 //////////////////////////////////////////////////////////////
 
-.float triggergravity;
+.float trigger_gravity_active;
 .entity trigger_gravity_check;
 void trigger_gravity_check_think()
 {
@@ -542,9 +542,8 @@ 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)
        {
-               dprint("XXXXXXXXXXXXXXXXXXXXXXXXXX "); // temporary execution test
                self.owner.gravity = 0;
-               self.owner.triggergravity = 0;
+               self.owner.trigger_gravity_active = 0;
                remove(self);
        }
        else
@@ -558,9 +557,9 @@ void trigger_gravity_touch()
 {
        EXACTTRIGGER_TOUCH;
 
-       if(!other.triggergravity)
+       if(!other.trigger_gravity_active)
        {
-               other.triggergravity = 1;
+               other.trigger_gravity_active = 1;
                other.trigger_gravity_check = spawn();
                other.trigger_gravity_check.owner = other;
                other.trigger_gravity_check.think = trigger_gravity_check_think;
index 09022ba67cd76955c48b1abc34f8f97796f20d31..8bdf47ad8265d726cc56720c893472ad61dfab27 100644 (file)
@@ -1775,10 +1775,10 @@ Must target a target_position that indicates the view to be shown (and whose ang
 target: must point to a target_position
 */
 
-/*QUAKED trigger_gravity (.5 .5 .5) ?
+/*QUAKED trigger_gravity (.5 .5 1) ?
 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.
+This acts as a modifier over the normal gravity (sv_gravity). eg: 0.5 is half 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
+gravity: gravity offset in this area
+noise: sound to play when an entity enters the gravity zone, leave empty to disable
 */
\ No newline at end of file