From 6443d5a4ae929b2fea8fc6040b518e1574bc1944 Mon Sep 17 00:00:00 2001 From: fruitiex Date: Wed, 2 Dec 2009 19:34:23 +0000 Subject: [PATCH] add a cvar that can disable wearing off on powerups git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8355 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/defaultNexuiz.cfg | 1 + data/qcsrc/server/cl_client.qc | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/defaultNexuiz.cfg b/data/defaultNexuiz.cfg index ba22d69a3..85e00fd89 100644 --- a/data/defaultNexuiz.cfg +++ b/data/defaultNexuiz.cfg @@ -455,6 +455,7 @@ set g_weapon_throwable 1 "if set to 1, weapons can be dropped" set g_powerup_superhealth 1 "if set to 0 the mega health powerup will not spawn on the map" set g_powerup_strength 1 "if set to 0 the strength powerup will not spawn on the map" set g_powerup_shield 1 "if set to 0 the shield (invincibility) powerup will not spawn on the map" +set g_balance_powerup_timer 1 "if set to 0 the powerups dont wear off" set g_use_ammunition 1 "if set to 0 all weapons you pick up have unlimited ammunition" set g_pickup_items 1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map" set g_minstagib 0 "enable minstagib" diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index e6028a8a4..fe54d2d31 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -1789,7 +1789,7 @@ void player_powerups (void) if (self.items & IT_INVINCIBLE) { play_countdown(self.invincible_finished, "misc/poweroff.wav"); - if (time > self.invincible_finished) + if (time > self.invincible_finished && cvar("g_balance_powerup_timer")) { self.items = self.items - (self.items & IT_INVINCIBLE); sprint(self, "^3Speed has worn off\n"); @@ -1810,7 +1810,7 @@ void player_powerups (void) { play_countdown(self.strength_finished, "misc/poweroff.wav"); self.effects = self.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT); - if (time > self.strength_finished) + if (time > self.strength_finished && cvar("g_balance_powerup_timer")) { self.items = self.items - (self.items & IT_STRENGTH); sprint(self, "^3Strength has worn off\n"); @@ -1828,7 +1828,7 @@ void player_powerups (void) { play_countdown(self.invincible_finished, "misc/poweroff.wav"); self.effects = self.effects | (EF_RED | EF_ADDITIVE | EF_FULLBRIGHT); - if (time > self.invincible_finished) + if (time > self.invincible_finished && cvar("g_balance_powerup_timer")) { self.items = self.items - (self.items & IT_INVINCIBLE); sprint(self, "^3Shield has worn off\n"); -- 2.39.2