From 7074f35e4ba831e358117842b99ee35b87f85ae5 Mon Sep 17 00:00:00 2001 From: void_17 Date: Mon, 2 Mar 2026 15:58:20 +0700 Subject: shared_ptr -> std::shared_ptr This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today. --- Minecraft.World/Inventory.h | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'Minecraft.World/Inventory.h') diff --git a/Minecraft.World/Inventory.h b/Minecraft.World/Inventory.h index 9d1aa7e0..ca4f6e79 100644 --- a/Minecraft.World/Inventory.h +++ b/Minecraft.World/Inventory.h @@ -25,8 +25,8 @@ public: Player *player; // This is owned by shared_ptrs, but we are owned by it private: - shared_ptr heldItem; - shared_ptr carried; + std::shared_ptr heldItem; + std::shared_ptr carried; public: bool changed; @@ -34,7 +34,7 @@ public: Inventory(Player *player); ~Inventory(); - shared_ptr getSelected(); + std::shared_ptr getSelected(); // 4J-PB - Added for the in-game tooltips bool IsHeldItem(); @@ -44,8 +44,8 @@ private: int getSlot(int tileId); int getSlot(int tileId, int data); - int getSlotWithRemainingSpace(shared_ptr item); - + int getSlotWithRemainingSpace(std::shared_ptr item); + public: int getFreeSlot(); @@ -58,7 +58,7 @@ public: void replaceSlot(Item *item, int data); private: - int addResource(shared_ptr itemInstance); + int addResource(std::shared_ptr itemInstance); public: void tick(); @@ -67,22 +67,22 @@ public: // 4J-PB added to get the right resource from the inventory for removal bool removeResource(int type,int iAuxVal); - void removeResources(shared_ptr item); // 4J Added for trading - + void removeResources(std::shared_ptr item); // 4J Added for trading + // 4J-Stu added to the get the item that would be affected by the removeResource functions - shared_ptr getResourceItem(int type); - shared_ptr getResourceItem(int type,int iAuxVal); + std::shared_ptr getResourceItem(int type); + std::shared_ptr getResourceItem(int type,int iAuxVal); bool hasResource(int type); void swapSlots(int from, int to); - bool add(shared_ptr item); + bool add(std::shared_ptr item); - shared_ptr removeItem(unsigned int slot, int count); - virtual shared_ptr removeItemNoUpdate(int slot); + std::shared_ptr removeItem(unsigned int slot, int count); + virtual std::shared_ptr removeItemNoUpdate(int slot); - void setItem(unsigned int slot, shared_ptr item); + void setItem(unsigned int slot, std::shared_ptr item); float getDestroySpeed(Tile *tile); @@ -92,17 +92,17 @@ public: unsigned int getContainerSize(); - shared_ptr getItem(unsigned int slot); + std::shared_ptr getItem(unsigned int slot); int getName(); int getMaxStackSize(); - int getAttackDamage(shared_ptr entity); + int getAttackDamage(std::shared_ptr entity); bool canDestroy(Tile *tile); - shared_ptr getArmor(int layer); + std::shared_ptr getArmor(int layer); int getArmorValue(); @@ -112,25 +112,25 @@ public: void setChanged(); - bool isSame(shared_ptr copy); + bool isSame(std::shared_ptr copy); private: - bool isSame(shared_ptr a, shared_ptr b); + bool isSame(std::shared_ptr a, std::shared_ptr b); public: - shared_ptr copy(); + std::shared_ptr copy(); - void setCarried(shared_ptr carried); + void setCarried(std::shared_ptr carried); - shared_ptr getCarried(); + std::shared_ptr getCarried(); - bool stillValid(shared_ptr player); + bool stillValid(std::shared_ptr player); - bool contains(shared_ptr itemInstance); + bool contains(std::shared_ptr itemInstance); virtual void startOpen(); virtual void stopOpen(); - void replaceWith(shared_ptr other); + void replaceWith(std::shared_ptr other); - int countMatches(shared_ptr itemInstance); // 4J Added + int countMatches(std::shared_ptr itemInstance); // 4J Added }; \ No newline at end of file -- cgit v1.2.3