Make consumable health work. Currently, picking up health spawns a model which will...

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index bb0398400646a6726a592e2d5a7f06d64a6ffd76..cf8d560483159101b8ba143d5d2be6bcc258bb74 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -219,6 +219,20 @@ void Item_ScheduleInitialRespawn(entity e)
        Item_ScheduleRespawnIn(e, game_starttime - time + ITEM_RESPAWNTIME_INITIAL(e));\r
 }\r
 \r
+void Item_Consumable_Spawn(entity e, entity pl)\r
+{\r
+       entity item;\r
+       item = spawn();\r
+       item.owner = e;\r
+       item.classname = "consumable";\r
+       setmodel(item, e.model);\r
+       item.movetype = MOVETYPE_FOLLOW;\r
+       item.solid = SOLID_NOT;\r
+\r
+       item.predator = pl;\r
+       item.aiment = pl;\r
+}\r
+\r
 float Item_GiveTo(entity item, entity player)\r
 {\r
        float _switchweapon;\r
@@ -304,8 +318,13 @@ float Item_GiveTo(entity item, entity player)
                if (player.health < item.max_health)\r
                {\r
                        pickedup = TRUE;\r
-                       player.health = min(player.health + item.health, item.max_health);\r
-                       player.pauserothealth_finished = max(player.pauserothealth_finished, time + cvar("g_balance_pause_health_rot"));\r
+                       if(item.dmg) // consumable item\r
+                               Item_Consumable_Spawn(self, player);\r
+                       else\r
+                       {\r
+                               player.health = min(player.health + item.health, item.max_health);\r
+                               player.pauserothealth_finished = max(player.pauserothealth_finished, time + cvar("g_balance_pause_health_rot"));\r
+                       }\r
                }\r
                if (item.armorvalue)\r
                if (player.armorvalue < item.max_armorvalue)\r
@@ -867,7 +886,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
+       self.dmg = 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
@@ -876,7 +895,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
+       self.dmg = 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
@@ -885,7 +904,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
+       self.dmg = 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
@@ -900,7 +919,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
+       self.dmg = 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