From 2feeb957a0e2bee4354445833009878de7db72d0 Mon Sep 17 00:00:00 2001 From: Mircea Kitsune Date: Mon, 3 May 2010 16:50:06 +0300 Subject: [PATCH] Name and comment optimizations. Remove test code. --- qcsrc/server/g_triggers.qc | 9 ++++----- scripts/entities.def | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc index 241d30164..73b019012 100644 --- a/qcsrc/server/g_triggers.qc +++ b/qcsrc/server/g_triggers.qc @@ -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; diff --git a/scripts/entities.def b/scripts/entities.def index 09022ba67..8bdf47ad8 100644 --- a/scripts/entities.def +++ b/scripts/entities.def @@ -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 -- 2.39.2