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

24
Minecraft.World/MerchantContainer.cpp
View File

@@ -3,7 +3,7 @@
#include "MerchantMenu.h"
#include "MerchantContainer.h"
MerchantContainer::MerchantContainer(shared_ptr<Player> player, shared_ptr<Merchant> villager)
MerchantContainer::MerchantContainer(std::shared_ptr<Player> player, std::shared_ptr<Merchant> villager)
{
this->player = player;
merchant = villager;
@@ -25,24 +25,24 @@ unsigned int MerchantContainer::getContainerSize()
return items.length;
}
shared_ptr<ItemInstance> MerchantContainer::getItem(unsigned int slot)
std::shared_ptr<ItemInstance> MerchantContainer::getItem(unsigned int slot)
{
return items[slot];
}
shared_ptr<ItemInstance> MerchantContainer::removeItem(unsigned int slot, int count)
std::shared_ptr<ItemInstance> MerchantContainer::removeItem(unsigned int slot, int count)
{
if (items[slot] != NULL)
{
if (slot == MerchantMenu::RESULT_SLOT)
{
shared_ptr<ItemInstance> item = items[slot];
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
return item;
}
if (items[slot]->count <= count)
{
shared_ptr<ItemInstance> item = items[slot];
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
if (isPaymentSlot(slot))
{
@@ -52,7 +52,7 @@ shared_ptr<ItemInstance> MerchantContainer::removeItem(unsigned int slot, int co
}
else
{
shared_ptr<ItemInstance> i = items[slot]->remove(count);
std::shared_ptr<ItemInstance> i = items[slot]->remove(count);
if (items[slot]->count == 0) items[slot] = nullptr;
if (isPaymentSlot(slot))
{
@@ -69,18 +69,18 @@ bool MerchantContainer::isPaymentSlot(int slot)
return slot == MerchantMenu::PAYMENT1_SLOT || slot == MerchantMenu::PAYMENT2_SLOT;
}
shared_ptr<ItemInstance> MerchantContainer::removeItemNoUpdate(int slot)
std::shared_ptr<ItemInstance> MerchantContainer::removeItemNoUpdate(int slot)
{
if (items[slot] != NULL)
{
shared_ptr<ItemInstance> item = items[slot];
std::shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
return item;
}
return nullptr;
}
void MerchantContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
void MerchantContainer::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
{
items[slot] = item;
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
@@ -100,7 +100,7 @@ int MerchantContainer::getMaxStackSize()
return Container::LARGE_MAX_STACK_SIZE;
}
bool MerchantContainer::stillValid(shared_ptr<Player> player)
bool MerchantContainer::stillValid(std::shared_ptr<Player> player)
{
return merchant->getTradingPlayer() == player;
}
@@ -122,8 +122,8 @@ void MerchantContainer::updateSellItem()
{
activeRecipe = NULL;
shared_ptr<ItemInstance> buyItem1 = items[MerchantMenu::PAYMENT1_SLOT];
shared_ptr<ItemInstance> buyItem2 = items[MerchantMenu::PAYMENT2_SLOT];
std::shared_ptr<ItemInstance> buyItem1 = items[MerchantMenu::PAYMENT1_SLOT];
std::shared_ptr<ItemInstance> buyItem2 = items[MerchantMenu::PAYMENT2_SLOT];
if (buyItem1 == NULL)
{