From 10d42a2452e19ca98506df4d85c0e8f37b3e8981 Mon Sep 17 00:00:00 2001 From: Lane Kolbly Date: Sun, 30 Jul 2017 12:53:21 -0500 Subject: Consolidated food effects into EatItem, added all fish type FoodInfos. (#3875) * Consolidated food effects into EatItem, added all fish types. * Changed type of NumFishInfos to satisfy clang. * Removed unused call for a_Item in EatItem --- src/Items/ItemHandler.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Items/ItemHandler.h') diff --git a/src/Items/ItemHandler.h b/src/Items/ItemHandler.h index 8141bfb23..9689ec50d 100644 --- a/src/Items/ItemHandler.h +++ b/src/Items/ItemHandler.h @@ -127,10 +127,7 @@ public: } ; /** Returns the FoodInfo for this item. (FoodRecovery and Saturation) */ - virtual FoodInfo GetFoodInfo(); - - /** If this function returns true, it sets the arguments to a effect who will be activated when you eat the item. */ - virtual bool GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_EffectDurationTicks, short & a_EffectIntensity, float & a_Chance); + virtual FoodInfo GetFoodInfo(const cItem * a_Item); /** Lets the player eat a selected item. Returns true if the player ate the item */ virtual bool EatItem(cPlayer * a_Player, cItem * a_Item); -- cgit v1.2.3