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/MerchantResultSlot.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Minecraft.World/MerchantResultSlot.h') diff --git a/Minecraft.World/MerchantResultSlot.h b/Minecraft.World/MerchantResultSlot.h index 7b8d97b6..1b45082c 100644 --- a/Minecraft.World/MerchantResultSlot.h +++ b/Minecraft.World/MerchantResultSlot.h @@ -9,25 +9,25 @@ class Merchant; class MerchantResultSlot : public Slot { private: - shared_ptr slots; + std::shared_ptr slots; Player *player; int removeCount; - shared_ptr merchant; + std::shared_ptr merchant; public: - MerchantResultSlot(Player *player, shared_ptr merchant, shared_ptr slots, int id, int x, int y); + MerchantResultSlot(Player *player, std::shared_ptr merchant, std::shared_ptr slots, int id, int x, int y); - bool mayPlace(shared_ptr item); - shared_ptr remove(int c); + bool mayPlace(std::shared_ptr item); + std::shared_ptr remove(int c); protected: - void onQuickCraft(shared_ptr picked, int count); - void checkTakeAchievements(shared_ptr carried); + void onQuickCraft(std::shared_ptr picked, int count); + void checkTakeAchievements(std::shared_ptr carried); public: - void onTake(shared_ptr player, shared_ptr carried); - virtual bool mayCombine(shared_ptr item); // 4J Added + void onTake(std::shared_ptr player, std::shared_ptr carried); + virtual bool mayCombine(std::shared_ptr item); // 4J Added private: - bool removePaymentItemsIfMatching(MerchantRecipe *activeRecipe, shared_ptr a, shared_ptr b); + bool removePaymentItemsIfMatching(MerchantRecipe *activeRecipe, std::shared_ptr a, std::shared_ptr b); }; \ No newline at end of file -- cgit v1.2.3