aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/InventoryMenu.h
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/InventoryMenu.h
parent8a2a62ea1d47364f802cf9aae97668bc4a7007b5 (diff)
Revert "shared_ptr -> std::shared_ptr"
This reverts commit 7074f35e4ba831e358117842b99ee35b87f85ae5.
Diffstat (limited to 'Minecraft.World/InventoryMenu.h')
-rw-r--r--Minecraft.World/InventoryMenu.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/Minecraft.World/InventoryMenu.h b/Minecraft.World/InventoryMenu.h
index cd18f95f..b37a4be9 100644
--- a/Minecraft.World/InventoryMenu.h
+++ b/Minecraft.World/InventoryMenu.h
@@ -23,22 +23,22 @@ public:
static const int USE_ROW_SLOT_END;
public:
- std::shared_ptr<CraftingContainer> craftSlots;
- std::shared_ptr<Container> resultSlots;
+ shared_ptr<CraftingContainer> craftSlots;
+ shared_ptr<Container> resultSlots;
bool active;
- InventoryMenu(std::shared_ptr<Inventory> inventory, bool active, Player *player);
+ InventoryMenu(shared_ptr<Inventory> inventory, bool active, Player *player);
private:
- void _init(std::shared_ptr<Inventory> inventory, bool active);
+ void _init(shared_ptr<Inventory> inventory, bool active);
public:
- virtual void slotsChanged(); // 4J used to take a std::shared_ptr<Container> but wasn't using it, so removed to simplify things
- virtual void removed(std::shared_ptr<Player> player);
- virtual bool stillValid(std::shared_ptr<Player> player);
- virtual std::shared_ptr<ItemInstance> quickMoveStack(std::shared_ptr<Player> player, int slotIndex);
- virtual bool mayCombine(Slot *slot, std::shared_ptr<ItemInstance> item);
+ virtual void slotsChanged(); // 4J used to take a shared_ptr<Container> but wasn't using it, so removed to simplify things
+ virtual void removed(shared_ptr<Player> player);
+ virtual bool stillValid(shared_ptr<Player> player);
+ virtual shared_ptr<ItemInstance> quickMoveStack(shared_ptr<Player> player, int slotIndex);
+ virtual bool mayCombine(Slot *slot, shared_ptr<ItemInstance> item);
// 4J ADDED,
- virtual std::shared_ptr<ItemInstance> clicked(int slotIndex, int buttonNum, int clickType, std::shared_ptr<Player> player);
+ virtual shared_ptr<ItemInstance> clicked(int slotIndex, int buttonNum, int clickType, shared_ptr<Player> player);
};