[nexuiz-commits] r8355 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-12-02 14:34:23 -0500 (Wed, 02 Dec 2009)
New Revision: 8355

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/cl_client.qc
Log:
add a cvar that can disable wearing off on powerups


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-12-02 19:32:33 UTC (rev 8354)
+++ trunk/data/defaultNexuiz.cfg	2009-12-02 19:34:23 UTC (rev 8355)
@@ -455,6 +455,7 @@
 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"

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2009-12-02 19:32:33 UTC (rev 8354)
+++ trunk/data/qcsrc/server/cl_client.qc	2009-12-02 19:34:23 UTC (rev 8355)
@@ -1789,7 +1789,7 @@
 		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 @@
 	{
 		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 @@
 	{
 		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");