Use the new cvars

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index c6c718fe758d9e71094b4910fc7b4f8d61c42e2f..2e278f5dbe4d6e1d1d8d4c687b762d7dec053dda 100644 (file)
--- 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;\r
 float g_pickup_healthsmall;\r
 float g_pickup_healthsmall_max;\r
+float g_pickup_healthsmall_consumable;\r
 float g_pickup_healthmedium;\r
 float g_pickup_healthmedium_max;\r
+float g_pickup_healthmedium_consumable;\r
 float g_pickup_healthlarge;\r
 float g_pickup_healthlarge_max;\r
+float g_pickup_healthlarge_consumable;\r
 float g_pickup_healthmega;\r
 float g_pickup_healthmega_max;\r
+float g_pickup_healthmega_consumable;\r
 float g_weaponspeedfactor;\r
 float g_weaponratefactor;\r
 float g_weapondamagefactor;\r
@@ -1065,12 +1069,16 @@ void readlevelcvars(void)
        g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max");\r
        g_pickup_healthsmall = cvar("g_pickup_healthsmall");\r
        g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max");\r
+       g_pickup_healthsmall_consumable = cvar("g_pickup_healthsmall_consumable");\r
        g_pickup_healthmedium = cvar("g_pickup_healthmedium");\r
        g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");\r
+       g_pickup_healthmedium_consumable = cvar("g_pickup_healthmedium_consumable");\r
        g_pickup_healthlarge = cvar("g_pickup_healthlarge");\r
        g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");\r
+       g_pickup_healthlarge_consumable = cvar("g_pickup_healthlarge_consumable");\r
        g_pickup_healthmega = cvar("g_pickup_healthmega");\r
        g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");\r
+       g_pickup_healthmega_consumable = cvar("g_pickup_healthmega_consumable");\r
 \r
        g_weapon_stay = cvar("g_weapon_stay");\r
 \r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index d99ff79fe285114d60b1ebf099b5790ab6aa80b0..bb0398400646a6726a592e2d5a7f06d64a6ffd76 100644 (file)
--- 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;\r
        if(!self.health)\r
                self.health = g_pickup_healthsmall;\r
+       self.cnt = g_pickup_healthsmall_consumable;\r
        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);\r
 }\r
 \r
@@ -875,6 +876,7 @@ void spawnfunc_item_health_medium (void) {
                self.max_health = g_pickup_healthmedium_max;\r
        if(!self.health)\r
                self.health = g_pickup_healthmedium;\r
+       self.cnt = g_pickup_healthmedium_consumable;\r
        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);\r
 }\r
 \r
@@ -883,6 +885,7 @@ void spawnfunc_item_health_large (void) {
                self.max_health = g_pickup_healthlarge_max;\r
        if(!self.health)\r
                self.health = g_pickup_healthlarge;\r
+       self.cnt = g_pickup_healthlarge_consumable;\r
        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);\r
 }\r
 \r
@@ -897,6 +900,7 @@ void spawnfunc_item_health_mega (void) {
                self.max_health = g_pickup_healthmega_max;\r
        if(!self.health)\r
                self.health = g_pickup_healthmega;\r
+       self.cnt = g_pickup_healthmega_consumable;\r
        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);\r
 }\r
 \r