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:
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "CompoundContainer.h"
|
||||
|
||||
CompoundContainer::CompoundContainer(int name, shared_ptr<Container> c1, shared_ptr<Container> c2)
|
||||
CompoundContainer::CompoundContainer(int name, std::shared_ptr<Container> c1, std::shared_ptr<Container> c2)
|
||||
{
|
||||
this->name = name;
|
||||
if (c1 == NULL) c1 = c2;
|
||||
@@ -22,25 +22,25 @@ int CompoundContainer::getName()
|
||||
return name;
|
||||
}
|
||||
|
||||
shared_ptr<ItemInstance> CompoundContainer::getItem(unsigned int slot)
|
||||
std::shared_ptr<ItemInstance> CompoundContainer::getItem(unsigned int slot)
|
||||
{
|
||||
if (slot >= c1->getContainerSize()) return c2->getItem(slot - c1->getContainerSize());
|
||||
else return c1->getItem(slot);
|
||||
}
|
||||
|
||||
shared_ptr<ItemInstance> CompoundContainer::removeItem(unsigned int slot, int i)
|
||||
std::shared_ptr<ItemInstance> CompoundContainer::removeItem(unsigned int slot, int i)
|
||||
{
|
||||
if (slot >= c1->getContainerSize()) return c2->removeItem(slot - c1->getContainerSize(), i);
|
||||
else return c1->removeItem(slot, i);
|
||||
}
|
||||
|
||||
shared_ptr<ItemInstance> CompoundContainer::removeItemNoUpdate(int slot)
|
||||
std::shared_ptr<ItemInstance> CompoundContainer::removeItemNoUpdate(int slot)
|
||||
{
|
||||
if (slot >= c1->getContainerSize()) return c2->removeItemNoUpdate(slot - c1->getContainerSize());
|
||||
else return c1->removeItemNoUpdate(slot);
|
||||
}
|
||||
|
||||
void CompoundContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
|
||||
void CompoundContainer::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
|
||||
{
|
||||
if (slot >= c1->getContainerSize()) c2->setItem(slot - c1->getContainerSize(), item);
|
||||
else c1->setItem(slot, item);
|
||||
@@ -57,7 +57,7 @@ void CompoundContainer::setChanged()
|
||||
c2->setChanged();
|
||||
}
|
||||
|
||||
bool CompoundContainer::stillValid(shared_ptr<Player> player)
|
||||
bool CompoundContainer::stillValid(std::shared_ptr<Player> player)
|
||||
{
|
||||
return c1->stillValid(player) && c2->stillValid(player);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user