summaryrefslogtreecommitdiffstats
path: root/src/Items
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-09-03 10:29:10 +0200
committermadmaxoft <github@xoft.cz>2014-09-03 10:29:10 +0200
commit1cc65b626462ca3e5aff1619e51450b5d33ff717 (patch)
treeea2586d669fbb609b3694aea685a21c3eb93cca8 /src/Items
parentQuick fix for a preprocessor error with clang on OS X (diff)
downloadcuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar
cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.gz
cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.bz2
cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.lz
cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.xz
cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.tar.zst
cuberite-1cc65b626462ca3e5aff1619e51450b5d33ff717.zip
Diffstat (limited to 'src/Items')
-rw-r--r--src/Items/ItemFood.h6
-rw-r--r--src/Items/ItemHandler.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Items/ItemFood.h b/src/Items/ItemFood.h
index c7e7ef2ca..8bea19fba 100644
--- a/src/Items/ItemFood.h
+++ b/src/Items/ItemFood.h
@@ -43,16 +43,16 @@ public:
case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2);
// Potatoes handled in ItemSeeds
case E_ITEM_PUMPKIN_PIE: return FoodInfo(8, 4.8);
+ case E_ITEM_RED_APPLE: return FoodInfo(4, 2.4);
case E_ITEM_RAW_BEEF: return FoodInfo(3, 1.8);
case E_ITEM_RAW_CHICKEN: return FoodInfo(2, 1.2);
case E_ITEM_RAW_FISH: return FoodInfo(2, 1.2);
+ case E_ITEM_RAW_MUTTON: return FoodInfo(2, 1.2);
case E_ITEM_RAW_PORKCHOP: return FoodInfo(3, 1.8);
- case E_ITEM_RAW_MUTTON: return FoodInfo(2, 1.2);
- case E_ITEM_RED_APPLE: return FoodInfo(4, 2.4);
case E_ITEM_ROTTEN_FLESH: return FoodInfo(4, 0.8);
case E_ITEM_SPIDER_EYE: return FoodInfo(2, 3.2);
case E_ITEM_STEAK: return FoodInfo(8, 12.8);
- case E_ITEM_MUTTON: return FoodInfo(6, 9.6);
+ case E_ITEM_MUTTON: return FoodInfo(6, 9.6);
}
LOGWARNING("%s: Unknown food item (%d), returning zero nutrition", __FUNCTION__, m_ItemType);
return FoodInfo(0, 0.f);
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 45a779ade..67c945ce4 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -207,7 +207,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
}
// Food (please keep alpha-sorted):
- // (carrots and potatoes handled in SeedHandler as both seed and food
+ // (carrots and potatoes handled separately in SeedHandler as they're both seed and food)
case E_ITEM_BAKED_POTATO:
case E_ITEM_BREAD:
case E_ITEM_COOKED_CHICKEN:
@@ -217,18 +217,18 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
case E_ITEM_GOLDEN_CARROT:
case E_ITEM_MELON_SLICE:
case E_ITEM_MUSHROOM_SOUP:
+ case E_ITEM_MUTTON:
case E_ITEM_POISONOUS_POTATO:
case E_ITEM_PUMPKIN_PIE:
+ case E_ITEM_RED_APPLE:
case E_ITEM_RAW_BEEF:
case E_ITEM_RAW_CHICKEN:
case E_ITEM_RAW_FISH:
+ case E_ITEM_RAW_MUTTON:
case E_ITEM_RAW_PORKCHOP:
- case E_ITEM_RAW_MUTTON:
- case E_ITEM_RED_APPLE:
case E_ITEM_ROTTEN_FLESH:
case E_ITEM_SPIDER_EYE:
case E_ITEM_STEAK:
- case E_ITEM_MUTTON:
{
return new cItemFoodHandler(a_ItemType);
}