summaryrefslogtreecommitdiffstats
path: root/src/Items/ItemHandler.cpp
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-06-08 01:32:37 +0200
committerarchshift <admin@archshift.com>2014-06-17 20:39:20 +0200
commit2185c72c2ca2d66b238d7d3234c173bd820d32ac (patch)
tree134bcd0c391bac1624a9adab5e8f9d6425fb9942 /src/Items/ItemHandler.cpp
parentImplemented milk, added documentation to Pawn.h (diff)
downloadcuberite-2185c72c2ca2d66b238d7d3234c173bd820d32ac.tar
cuberite-2185c72c2ca2d66b238d7d3234c173bd820d32ac.tar.gz
cuberite-2185c72c2ca2d66b238d7d3234c173bd820d32ac.tar.bz2
cuberite-2185c72c2ca2d66b238d7d3234c173bd820d32ac.tar.lz
cuberite-2185c72c2ca2d66b238d7d3234c173bd820d32ac.tar.xz
cuberite-2185c72c2ca2d66b238d7d3234c173bd820d32ac.tar.zst
cuberite-2185c72c2ca2d66b238d7d3234c173bd820d32ac.zip
Diffstat (limited to 'src/Items/ItemHandler.cpp')
-rw-r--r--src/Items/ItemHandler.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 83be87b9e..f847c8ffa 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -35,6 +35,7 @@
#include "ItemNetherWart.h"
#include "ItemPainting.h"
#include "ItemPickaxe.h"
+#include "ItemPotion.h"
#include "ItemThrowable.h"
#include "ItemRedstoneDust.h"
#include "ItemRedstoneRepeater.h"
@@ -124,6 +125,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
case E_ITEM_ITEM_FRAME: return new cItemItemFrameHandler(a_ItemType);
case E_ITEM_NETHER_WART: return new cItemNetherWartHandler(a_ItemType);
case E_ITEM_PAINTING: return new cItemPaintingHandler(a_ItemType);
+ case E_ITEM_POTIONS: return new cItemPotionHandler();
case E_ITEM_REDSTONE_DUST: return new cItemRedstoneDustHandler(a_ItemType);
case E_ITEM_REDSTONE_REPEATER: return new cItemRedstoneRepeaterHandler(a_ItemType);
case E_ITEM_SHEARS: return new cItemShearsHandler(a_ItemType);
@@ -502,8 +504,10 @@ bool cItemHandler::IsFood(void)
-bool cItemHandler::IsDrinkable(void)
+bool cItemHandler::IsDrinkable(const cItem * a_Item)
{
+ UNUSED(a_Item);
+
switch (m_ItemType)
{
case E_ITEM_MILK: