From a0c2563b9c23690dfe09017e90520794feadf31d Mon Sep 17 00:00:00 2001 From: esteel Date: Wed, 5 Apr 2006 22:18:35 +0000 Subject: [PATCH] The laser got a small viewkick The video menu does mention the numbers 0-4 in parens The armor/health regen/rot is configurable git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1232 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/gamec/t_items.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/server/gamec/t_items.c b/data/qcsrc/server/gamec/t_items.c index 95ea00626..e39cdb3a4 100644 --- a/data/qcsrc/server/gamec/t_items.c +++ b/data/qcsrc/server/gamec/t_items.c @@ -128,14 +128,14 @@ void Item_Touch (void) if (self.max_health) { other.health = other.health + self.max_health; - other.pauserothealth_finished = max(other.pauserothealth_finished, time + 5); + other.pauserothealth_finished = max(other.pauserothealth_finished, time + cvar("g_balance_pause_health_rot")); } if (self.health && other.health < other.max_health) other.health = min(other.health + self.health, other.max_health); if (self.armorvalue) { other.armorvalue = other.armorvalue + self.armorvalue; - other.pauserotarmor_finished = max(other.pauserotarmor_finished, time + 5); + other.pauserotarmor_finished = max(other.pauserotarmor_finished, time + cvar("g_balance_pause_armor_rot")); } } -- 2.39.2