aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/FoodItem.cpp
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 17:37:16 +0700
commit119bff351450ea16ffda550b6e0f67379b29f708 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/FoodItem.cpp
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/FoodItem.cpp')
-rw-r--r--Minecraft.World/FoodItem.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.World/FoodItem.cpp b/Minecraft.World/FoodItem.cpp
index e617490a..f5304cb9 100644
--- a/Minecraft.World/FoodItem.cpp
+++ b/Minecraft.World/FoodItem.cpp
@@ -33,7 +33,7 @@ FoodItem::FoodItem(int id, int nutrition, bool isMeat)
_init();
}
-std::shared_ptr<ItemInstance> FoodItem::useTimeDepleted(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player)
+shared_ptr<ItemInstance> FoodItem::useTimeDepleted(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player)
{
instance->count--;
player->getFoodData()->eat(this);
@@ -45,7 +45,7 @@ std::shared_ptr<ItemInstance> FoodItem::useTimeDepleted(std::shared_ptr<ItemInst
return instance;
}
-void FoodItem::addEatEffect(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player)
+void FoodItem::addEatEffect(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player)
{
if (!level->isClientSide && effectId > 0 && level->random->nextFloat() < effectProbability)
{
@@ -54,17 +54,17 @@ void FoodItem::addEatEffect(std::shared_ptr<ItemInstance> instance, Level *level
}
-int FoodItem::getUseDuration(std::shared_ptr<ItemInstance> itemInstance)
+int FoodItem::getUseDuration(shared_ptr<ItemInstance> itemInstance)
{
return EAT_DURATION;
}
-UseAnim FoodItem::getUseAnimation(std::shared_ptr<ItemInstance> itemInstance)
+UseAnim FoodItem::getUseAnimation(shared_ptr<ItemInstance> itemInstance)
{
return UseAnim_eat;
}
-std::shared_ptr<ItemInstance> FoodItem::use(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player)
+shared_ptr<ItemInstance> FoodItem::use(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player)
{
if (player->canEat(canAlwaysEat))
{
@@ -73,7 +73,7 @@ std::shared_ptr<ItemInstance> FoodItem::use(std::shared_ptr<ItemInstance> instan
// 4J : WESTY : Other award ... eating cooked pork chop.
// 4J-JEV: This is just for an avatar award on the xbox.
-#ifdef _XBOX
+#ifdef _XBOX
if ( instance->getItem() == Item::porkChop_cooked )
{
player->awardStat(GenericStats::eatPorkChop(),GenericStats::param_eatPorkChop());
@@ -114,7 +114,7 @@ FoodItem *FoodItem::setCanAlwaysEat()
}
// 4J Added
-bool FoodItem::canEat(std::shared_ptr<Player> player)
+bool FoodItem::canEat(shared_ptr<Player> player)
{
return player->canEat(canAlwaysEat);
}