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.
This commit is contained in:
@@ -10,29 +10,29 @@ class MerchantRecipe;
|
||||
class MerchantContainer : public Container
|
||||
{
|
||||
private:
|
||||
shared_ptr<Merchant> merchant;
|
||||
std::shared_ptr<Merchant> merchant;
|
||||
ItemInstanceArray items;
|
||||
shared_ptr<Player> player;
|
||||
std::shared_ptr<Player> player;
|
||||
MerchantRecipe *activeRecipe;
|
||||
int selectionHint;
|
||||
|
||||
public:
|
||||
MerchantContainer(shared_ptr<Player> player, shared_ptr<Merchant> villager);
|
||||
MerchantContainer(std::shared_ptr<Player> player, std::shared_ptr<Merchant> villager);
|
||||
~MerchantContainer();
|
||||
|
||||
unsigned int getContainerSize();
|
||||
shared_ptr<ItemInstance> getItem(unsigned int slot);
|
||||
shared_ptr<ItemInstance> removeItem(unsigned int slot, int count);
|
||||
std::shared_ptr<ItemInstance> getItem(unsigned int slot);
|
||||
std::shared_ptr<ItemInstance> removeItem(unsigned int slot, int count);
|
||||
|
||||
private:
|
||||
bool isPaymentSlot(int slot);
|
||||
|
||||
public:
|
||||
shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
|
||||
void setItem(unsigned int slot, shared_ptr<ItemInstance> item);
|
||||
std::shared_ptr<ItemInstance> removeItemNoUpdate(int slot);
|
||||
void setItem(unsigned int slot, std::shared_ptr<ItemInstance> item);
|
||||
int getName();
|
||||
int getMaxStackSize();
|
||||
bool stillValid(shared_ptr<Player> player);
|
||||
bool stillValid(std::shared_ptr<Player> player);
|
||||
void startOpen();
|
||||
void stopOpen();
|
||||
void setChanged();
|
||||
|
||||
Reference in New Issue
Block a user