flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge mushroom soup into generic food handler 

...and fix eating the bowl when eating rabbit stew
This commit is contained in:
Gargaj 2015-12-01 23:30:47 +01:00
parent 213419a4cc
commit 72b2ab6406
4 changed files with 25 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Items/CMakeLists.txt
View File

@ -38,7 +38,6 @@ SET (HDRS
ItemMilk.h
ItemMinecart.h
ItemMobHead.h
ItemMushroomSoup.h
ItemNetherWart.h
ItemPainting.h
ItemPickaxe.h

24
src/Items/ItemFood.h
View File

@ -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;
}
};

3
src/Items/ItemHandler.cpp
View File

@ -37,7 +37,6 @@
#include "ItemMilk.h"
#include "ItemMinecart.h"
#include "ItemMobHead.h"
#include "ItemMushroomSoup.h"
#include "ItemNetherWart.h"
#include "ItemPainting.h"
#include "ItemPickaxe.h"
@ -138,7 +137,6 @@ cItemHandler * cItemHandler::CreateItemHandler(int a_ItemType)
case E_ITEM_GOLDEN_APPLE: return new cItemGoldenAppleHandler();
case E_ITEM_MAP: return new cItemMapHandler();
case E_ITEM_MILK: return new cItemMilkHandler();
case E_ITEM_MUSHROOM_SOUP: return new cItemMushroomSoupHandler(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);
@ -237,6 +235,7 @@ cItemHandler * cItemHandler::CreateItemHandler(int a_ItemType)
case E_ITEM_COOKIE:
case E_ITEM_GOLDEN_CARROT:
case E_ITEM_MELON_SLICE:
case E_ITEM_MUSHROOM_SOUP:
case E_ITEM_POISONOUS_POTATO:
case E_ITEM_PUMPKIN_PIE:
case E_ITEM_RABBIT_STEW:

53
src/Items/ItemMushroomSoup.h
View File

@ -1,53 +0,0 @@
#pragma once
#include "ItemHandler.h"
class cItemMushroomSoupHandler :
public cItemHandler
{
typedef cItemHandler super;
public:
cItemMushroomSoupHandler(int a_ItemType)
: super(a_ItemType)
{
}
virtual bool IsFood(void) override
{
return true;
}
virtual FoodInfo GetFoodInfo(void) override
{
return FoodInfo(6, 7.2);
}
virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
{
if (!super::EatItem(a_Player, a_Item))
{
return false;
}
// Return a bowl to the inventory
if (!a_Player->IsGameModeCreative())
{
a_Player->GetInventory().AddItem(cItem(E_ITEM_BOWL));
}
return true;
}
};