Don't allow consumable items when g_vore is disabled, but use the old system instead...

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index f785c3bca16080bcb40eaf984c128d387ea320e3..402a25c1856b46693026614f0cf81f05599dfb7b 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -481,7 +481,7 @@ float Item_GiveTo(entity item, entity player)
 \r
                if (item.health)\r
                {\r
-                       if(item.dmg) // consumable item\r
+                       if(item.dmg && cvar("g_vore")) // consumable item, only if the vore system is enabled\r
                        {\r
                                if(player.stomach_load + item.dmg <= player.stomach_maxload)\r
                                if not(!cvar("g_balance_health_consumable_alwayspickup") && player.health >= item.max_health)\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 00cc14f1598ad6c44c0aed7e30206c250401ecfa..67d6729276d6f84bbe5c0a6348a388ffc2f89ce2 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -124,4 +124,4 @@
 \r
 - 0.7 BUG: Swallow model gets bumped outside of the view at times. This is likely due to the change to offset the original weapon viewmodel.\r
 \r
-- 0.7 BUG: Fix the following crash, apparently taking place after the tutorial map: http://pastebin.com/hz9md090
\ No newline at end of file
+- 0.7: In the campaign, you keep getting the "HUD booting" message and no HUD until armor gets enabled. This needs to be fixed somehow
\ No newline at end of file