From 119bff351450ea16ffda550b6e0f67379b29f708 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 17:37:16 +0700 Subject: Revert "shared_ptr -> std::shared_ptr" This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5. --- Minecraft.World/FurnaceMenu.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Minecraft.World/FurnaceMenu.cpp') 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, std::shared_ptr furnace) : AbstractContainerMenu() +FurnaceMenu::FurnaceMenu(shared_ptr inventory, shared_ptr 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) +bool FurnaceMenu::stillValid(shared_ptr player) { return furnace->stillValid(player); } -std::shared_ptr FurnaceMenu::quickMoveStack(std::shared_ptr player, int slotIndex) +shared_ptr FurnaceMenu::quickMoveStack(shared_ptr player, int slotIndex) { - std::shared_ptr clicked = nullptr; + shared_ptr clicked = nullptr; Slot *slot = slots->at(slotIndex); //Slot *IngredientSlot = slots->at(INGREDIENT_SLOT); @@ -90,7 +90,7 @@ std::shared_ptr FurnaceMenu::quickMoveStack(std::shared_ptrhasItem()) { - std::shared_ptr stack = slot->getItem(); + shared_ptr stack = slot->getItem(); clicked = stack->copy(); if (slotIndex == RESULT_SLOT) @@ -160,11 +160,11 @@ std::shared_ptr FurnaceMenu::quickMoveStack(std::shared_ptr FurnaceMenu::clicked(int slotIndex, int buttonNum, int clickType, std::shared_ptr player) +shared_ptr FurnaceMenu::clicked(int slotIndex, int buttonNum, int clickType, shared_ptr player) { bool charcoalUsed = furnace->wasCharcoalUsed(); - std::shared_ptr out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player); + shared_ptr out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player); #ifdef _EXTENDED_ACHIEVEMENTS if ( charcoalUsed && (out!=nullptr) && (buttonNum==0 || buttonNum==1) && clickType==CLICK_PICKUP -- cgit v1.2.3