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/MerchantContainer.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Minecraft.World/MerchantContainer.h') diff --git a/Minecraft.World/MerchantContainer.h b/Minecraft.World/MerchantContainer.h index 9f4efe33..efba13d6 100644 --- a/Minecraft.World/MerchantContainer.h +++ b/Minecraft.World/MerchantContainer.h @@ -10,29 +10,29 @@ class MerchantRecipe; class MerchantContainer : public Container { private: - std::shared_ptr merchant; + shared_ptr merchant; ItemInstanceArray items; - std::shared_ptr player; + shared_ptr player; MerchantRecipe *activeRecipe; int selectionHint; public: - MerchantContainer(std::shared_ptr player, std::shared_ptr villager); + MerchantContainer(shared_ptr player, shared_ptr villager); ~MerchantContainer(); unsigned int getContainerSize(); - std::shared_ptr getItem(unsigned int slot); - std::shared_ptr removeItem(unsigned int slot, int count); + shared_ptr getItem(unsigned int slot); + shared_ptr removeItem(unsigned int slot, int count); private: bool isPaymentSlot(int slot); public: - std::shared_ptr removeItemNoUpdate(int slot); - void setItem(unsigned int slot, std::shared_ptr item); + shared_ptr removeItemNoUpdate(int slot); + void setItem(unsigned int slot, shared_ptr item); int getName(); int getMaxStackSize(); - bool stillValid(std::shared_ptr player); + bool stillValid(shared_ptr player); void startOpen(); void stopOpen(); void setChanged(); -- cgit v1.2.3