From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 19 Nov 2011 11:15:35 +0000 (+0200)
Subject: Use the new cvars
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=769c2fc5ae3c977d10dbfa045b5bd0691731dcf5;p=voretournament%2Fvoretournament.git

Use the new cvars
---

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index c6c718fe..2e278f5d 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -818,12 +818,16 @@ float g_pickup_armorlarge;
 float g_pickup_armorlarge_max;
 float g_pickup_healthsmall;
 float g_pickup_healthsmall_max;
+float g_pickup_healthsmall_consumable;
 float g_pickup_healthmedium;
 float g_pickup_healthmedium_max;
+float g_pickup_healthmedium_consumable;
 float g_pickup_healthlarge;
 float g_pickup_healthlarge_max;
+float g_pickup_healthlarge_consumable;
 float g_pickup_healthmega;
 float g_pickup_healthmega_max;
+float g_pickup_healthmega_consumable;
 float g_weaponspeedfactor;
 float g_weaponratefactor;
 float g_weapondamagefactor;
@@ -1065,12 +1069,16 @@ void readlevelcvars(void)
 	g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max");
 	g_pickup_healthsmall = cvar("g_pickup_healthsmall");
 	g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max");
+	g_pickup_healthsmall_consumable = cvar("g_pickup_healthsmall_consumable");
 	g_pickup_healthmedium = cvar("g_pickup_healthmedium");
 	g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
+	g_pickup_healthmedium_consumable = cvar("g_pickup_healthmedium_consumable");
 	g_pickup_healthlarge = cvar("g_pickup_healthlarge");
 	g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
+	g_pickup_healthlarge_consumable = cvar("g_pickup_healthlarge_consumable");
 	g_pickup_healthmega = cvar("g_pickup_healthmega");
 	g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
+	g_pickup_healthmega_consumable = cvar("g_pickup_healthmega_consumable");
 
 	g_weapon_stay = cvar("g_weapon_stay");
 
diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index d99ff79f..bb039840 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -867,6 +867,7 @@ void spawnfunc_item_health_small (void) {
 		self.max_health = g_pickup_healthsmall_max;
 	if(!self.health)
 		self.health = g_pickup_healthsmall;
+	self.cnt = g_pickup_healthsmall_consumable;
 	StartItem ("models/items/g_h1.md3", "misc/minihealth.wav", g_pickup_respawntime_short, g_pickup_respawntimejitter_short, "5 Health", IT_5HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
 }
 
@@ -875,6 +876,7 @@ void spawnfunc_item_health_medium (void) {
 		self.max_health = g_pickup_healthmedium_max;
 	if(!self.health)
 		self.health = g_pickup_healthmedium;
+	self.cnt = g_pickup_healthmedium_consumable;
 	StartItem ("models/items/g_h25.md3", "misc/mediumhealth.wav", g_pickup_respawntime_short, g_pickup_respawntimejitter_short, "25 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);
 }
 
@@ -883,6 +885,7 @@ void spawnfunc_item_health_large (void) {
 		self.max_health = g_pickup_healthlarge_max;
 	if(!self.health)
 		self.health = g_pickup_healthlarge;
+	self.cnt = g_pickup_healthlarge_consumable;
 	StartItem ("models/items/g_h50.md3", "misc/largehealth.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "50 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);
 }
 
@@ -897,6 +900,7 @@ void spawnfunc_item_health_mega (void) {
 		self.max_health = g_pickup_healthmega_max;
 	if(!self.health)
 		self.health = g_pickup_healthmega;
+	self.cnt = g_pickup_healthmega_consumable;
 	StartItem ("models/items/g_h100.md3", "misc/megahealth.wav", g_pickup_respawntime_long, g_pickup_respawntimejitter_long, "100 Health", IT_HEALTH, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_HIGH);
 }