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:
@@ -5,7 +5,7 @@
|
||||
#include "Slot.h"
|
||||
#include "TrapMenu.h"
|
||||
|
||||
TrapMenu::TrapMenu(shared_ptr<Container> inventory, shared_ptr<DispenserTileEntity> trap)
|
||||
TrapMenu::TrapMenu(std::shared_ptr<Container> inventory, std::shared_ptr<DispenserTileEntity> trap)
|
||||
{
|
||||
this->trap = trap;
|
||||
|
||||
@@ -30,19 +30,19 @@ TrapMenu::TrapMenu(shared_ptr<Container> inventory, shared_ptr<DispenserTileEnti
|
||||
}
|
||||
}
|
||||
|
||||
bool TrapMenu::stillValid(shared_ptr<Player> player)
|
||||
bool TrapMenu::stillValid(std::shared_ptr<Player> player)
|
||||
{
|
||||
return trap->stillValid(player);
|
||||
}
|
||||
|
||||
// 4J Stu - Brought forward from 1.2
|
||||
shared_ptr<ItemInstance> TrapMenu::quickMoveStack(shared_ptr<Player> player, int slotIndex)
|
||||
std::shared_ptr<ItemInstance> TrapMenu::quickMoveStack(std::shared_ptr<Player> player, int slotIndex)
|
||||
{
|
||||
shared_ptr<ItemInstance> clicked = nullptr;
|
||||
std::shared_ptr<ItemInstance> clicked = nullptr;
|
||||
Slot *slot = slots->at(slotIndex);
|
||||
if (slot != NULL && slot->hasItem())
|
||||
{
|
||||
shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
std::shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
clicked = stack->copy();
|
||||
|
||||
if (slotIndex < INV_SLOT_START)
|
||||
|
||||
Reference in New Issue
Block a user