From 72b2ab6406ca57627e2b91c0ffe054dafbe0cca5 Mon Sep 17 00:00:00 2001
From: Gargaj <gargaj@conspiracy.hu>
Date: Tue, 1 Dec 2015 23:30:47 +0100
Subject: Merge mushroom soup into generic food handler ...and fix eating the
 bowl when eating rabbit stew

---
 src/Items/ItemFood.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src/Items/ItemFood.h')

diff --git a/src/Items/ItemFood.h b/src/Items/ItemFood.h
index e7c718c77..2fbbb2528 100644
--- a/src/Items/ItemFood.h
+++ b/src/Items/ItemFood.h
@@ -42,6 +42,7 @@ public:
 			// Golden apple handled in ItemGoldenApple
 			case E_ITEM_GOLDEN_CARROT:    return FoodInfo(6, 14.4);
 			case E_ITEM_MELON_SLICE:      return FoodInfo(2, 1.2);
+			case E_ITEM_MUSHROOM_SOUP:    return FoodInfo(6, 7.2);
 			case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2);
 			// Potatoes handled in ItemSeeds
 			case E_ITEM_PUMPKIN_PIE:      return FoodInfo(8, 4.8);
@@ -101,6 +102,29 @@ public:
 		return false;
 	}
 
+	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
+	{
+		if (!super::EatItem(a_Player, a_Item))
+		{
+			return false;
+		}
+
+		switch (m_ItemType)
+		{
+			case E_ITEM_MUSHROOM_SOUP:
+			case E_ITEM_RABBIT_STEW:
+			{
+				// Return a bowl to the inventory
+				if (!a_Player->IsGameModeCreative())
+				{
+					a_Player->GetInventory().AddItem(cItem(E_ITEM_BOWL));
+				}
+				break;
+			}
+		}
+		return true;
+	}
+
 };
 
 
-- 
cgit v1.2.3