Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared_ptr -> std::shared_ptr

Browse Source 
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.
This commit is contained in:
void_17
2026-03-02 15:58:20 +07:00
parent d63f79325f
commit 7074f35e4b
1373 changed files with 12054 additions and 12054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Minecraft.World/MerchantResultSlot.h
View File

@@ -9,25 +9,25 @@ class Merchant;
class MerchantResultSlot : public Slot
{
private:
shared_ptr<MerchantContainer> slots;
std::shared_ptr<MerchantContainer> slots;
Player *player;
int removeCount;
shared_ptr<Merchant> merchant;
std::shared_ptr<Merchant> merchant;
public:
MerchantResultSlot(Player *player, shared_ptr<Merchant> merchant, shared_ptr<MerchantContainer> slots, int id, int x, int y);
MerchantResultSlot(Player *player, std::shared_ptr<Merchant> merchant, std::shared_ptr<MerchantContainer> slots, int id, int x, int y);
bool mayPlace(shared_ptr<ItemInstance> item);
shared_ptr<ItemInstance> remove(int c);
bool mayPlace(std::shared_ptr<ItemInstance> item);
std::shared_ptr<ItemInstance> remove(int c);
protected:
void onQuickCraft(shared_ptr<ItemInstance> picked, int count);
void checkTakeAchievements(shared_ptr<ItemInstance> carried);
void onQuickCraft(std::shared_ptr<ItemInstance> picked, int count);
void checkTakeAchievements(std::shared_ptr<ItemInstance> carried);
public:
void onTake(shared_ptr<Player> player, shared_ptr<ItemInstance> carried);
virtual bool mayCombine(shared_ptr<ItemInstance> item); // 4J Added
void onTake(std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> carried);
virtual bool mayCombine(std::shared_ptr<ItemInstance> item); // 4J Added
private:
bool removePaymentItemsIfMatching(MerchantRecipe *activeRecipe, shared_ptr<ItemInstance> a, shared_ptr<ItemInstance> b);
bool removePaymentItemsIfMatching(MerchantRecipe *activeRecipe, std::shared_ptr<ItemInstance> a, std::shared_ptr<ItemInstance> b);
};