mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-11 19:53:52 +00:00
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:
parent
d63f79325f
commit
7074f35e4b
1373 changed files with 12054 additions and 12054 deletions
|
|
@ -3,10 +3,10 @@
|
|||
#include "net.minecraft.world.inventory.h"
|
||||
#include "ClientSideMerchant.h"
|
||||
|
||||
ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, int name)
|
||||
ClientSideMerchant::ClientSideMerchant(std::shared_ptr<Player> source, int name)
|
||||
{
|
||||
this->source = source;
|
||||
// 4J Stu - Need to do this after creating as a shared_ptr
|
||||
// 4J Stu - Need to do this after creating as a std::shared_ptr
|
||||
container = NULL; //new MerchantContainer(source, this);
|
||||
currentOffers = NULL;
|
||||
m_name = name;
|
||||
|
|
@ -28,17 +28,17 @@ Container *ClientSideMerchant::getContainer()
|
|||
return container;
|
||||
}
|
||||
|
||||
shared_ptr<Player> ClientSideMerchant::getTradingPlayer()
|
||||
std::shared_ptr<Player> ClientSideMerchant::getTradingPlayer()
|
||||
{
|
||||
return source;
|
||||
}
|
||||
|
||||
void ClientSideMerchant::setTradingPlayer(shared_ptr<Player> player)
|
||||
void ClientSideMerchant::setTradingPlayer(std::shared_ptr<Player> player)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
MerchantRecipeList *ClientSideMerchant::getOffers(shared_ptr<Player> forPlayer)
|
||||
MerchantRecipeList *ClientSideMerchant::getOffers(std::shared_ptr<Player> forPlayer)
|
||||
{
|
||||
return currentOffers;
|
||||
}
|
||||
|
|
@ -54,7 +54,7 @@ void ClientSideMerchant::notifyTrade(MerchantRecipe *activeRecipe)
|
|||
activeRecipe->increaseUses();
|
||||
}
|
||||
|
||||
void ClientSideMerchant::notifyTradeUpdated(shared_ptr<ItemInstance> item)
|
||||
void ClientSideMerchant::notifyTradeUpdated(std::shared_ptr<ItemInstance> item)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue