aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/FurnaceMenu.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/FurnaceMenu.cpp
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/FurnaceMenu.cpp')
-rw-r--r--Minecraft.World/FurnaceMenu.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/Minecraft.World/FurnaceMenu.cpp b/Minecraft.World/FurnaceMenu.cpp
index 58f3b77d..dca02231 100644
--- a/Minecraft.World/FurnaceMenu.cpp
+++ b/Minecraft.World/FurnaceMenu.cpp
@@ -8,7 +8,7 @@
#include "FurnaceMenu.h"
#include "FurnaceRecipes.h"
-FurnaceMenu::FurnaceMenu(std::shared_ptr<Inventory> inventory, std::shared_ptr<FurnaceTileEntity> furnace) : AbstractContainerMenu()
+FurnaceMenu::FurnaceMenu(shared_ptr<Inventory> inventory, shared_ptr<FurnaceTileEntity> furnace) : AbstractContainerMenu()
{
tc = 0;
lt = 0;
@@ -44,12 +44,12 @@ void FurnaceMenu::addSlotListener(ContainerListener *listener)
void FurnaceMenu::broadcastChanges()
{
AbstractContainerMenu::broadcastChanges();
-
+
AUTO_VAR(itEnd, containerListeners->end());
for (AUTO_VAR(it, containerListeners->begin()); it != itEnd; it++)
{
ContainerListener *listener = *it; //containerListeners->at(i);
- if (tc != furnace->tickCount)
+ if (tc != furnace->tickCount)
{
listener->setContainerData(this, 0, furnace->tickCount);
}
@@ -57,7 +57,7 @@ void FurnaceMenu::broadcastChanges()
{
listener->setContainerData(this, 1, furnace->litTime);
}
- if (ld != furnace->litDuration)
+ if (ld != furnace->litDuration)
{
listener->setContainerData(this, 2, furnace->litDuration);
}
@@ -75,14 +75,14 @@ void FurnaceMenu::setData(int id, int value)
if (id == 2) furnace->litDuration = value;
}
-bool FurnaceMenu::stillValid(std::shared_ptr<Player> player)
+bool FurnaceMenu::stillValid(shared_ptr<Player> player)
{
return furnace->stillValid(player);
}
-std::shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(std::shared_ptr<Player> player, int slotIndex)
+shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
{
- std::shared_ptr<ItemInstance> clicked = nullptr;
+ shared_ptr<ItemInstance> clicked = nullptr;
Slot *slot = slots->at(slotIndex);
//Slot *IngredientSlot = slots->at(INGREDIENT_SLOT);
@@ -90,7 +90,7 @@ std::shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(std::shared_ptr<Player
if (slot != NULL && slot->hasItem())
{
- std::shared_ptr<ItemInstance> stack = slot->getItem();
+ shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
if (slotIndex == RESULT_SLOT)
@@ -160,11 +160,11 @@ std::shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(std::shared_ptr<Player
return clicked;
}
-std::shared_ptr<ItemInstance> FurnaceMenu::clicked(int slotIndex, int buttonNum, int clickType, std::shared_ptr<Player> player)
+shared_ptr<ItemInstance> FurnaceMenu::clicked(int slotIndex, int buttonNum, int clickType, shared_ptr<Player> player)
{
bool charcoalUsed = furnace->wasCharcoalUsed();
- std::shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
+ shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
#ifdef _EXTENDED_ACHIEVEMENTS
if ( charcoalUsed && (out!=nullptr) && (buttonNum==0 || buttonNum==1) && clickType==CLICK_PICKUP