From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 1 Mar 2012 12:14:05 +0000 (+0200)
Subject: Don't allow consumable items when g_vore is disabled, but use the old system instead... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e676224c75c5204e8a46ee913237d623c077e780;p=voretournament%2Fvoretournament.git

Don't allow consumable items when g_vore is disabled, but use the old system instead. This fixes a major bug
---

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index f785c3bc..402a25c1 100644
--- 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)
 
 		if (item.health)
 		{
-			if(item.dmg) // consumable item
+			if(item.dmg && cvar("g_vore")) // consumable item, only if the vore system is enabled
 			{
 				if(player.stomach_load + item.dmg <= player.stomach_maxload)
 				if not(!cvar("g_balance_health_consumable_alwayspickup") && player.health >= item.max_health)
diff --git a/docs/TODO.txt b/docs/TODO.txt
index 00cc14f1..67d67292 100644
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -124,4 +124,4 @@
 
 - 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.
 
-- 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