* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
64 lines
1.3 KiB
C++
64 lines
1.3 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.item.trading.h"
|
|
#include "net.minecraft.world.inventory.h"
|
|
#include "ClientSideMerchant.h"
|
|
|
|
ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, const wstring &name)
|
|
{
|
|
this->source = source;
|
|
// 4J Stu - Need to do this after creating as a shared_ptr
|
|
container = nullptr; //new MerchantContainer(source, this);
|
|
currentOffers = nullptr;
|
|
m_name = name;
|
|
}
|
|
|
|
ClientSideMerchant::~ClientSideMerchant()
|
|
{
|
|
delete container;
|
|
delete currentOffers;
|
|
}
|
|
|
|
void ClientSideMerchant::createContainer()
|
|
{
|
|
container = new MerchantContainer(source, shared_from_this());
|
|
}
|
|
|
|
Container *ClientSideMerchant::getContainer()
|
|
{
|
|
return container;
|
|
}
|
|
|
|
shared_ptr<Player> ClientSideMerchant::getTradingPlayer()
|
|
{
|
|
return source;
|
|
}
|
|
|
|
void ClientSideMerchant::setTradingPlayer(shared_ptr<Player> player)
|
|
{
|
|
|
|
}
|
|
|
|
MerchantRecipeList *ClientSideMerchant::getOffers(shared_ptr<Player> forPlayer)
|
|
{
|
|
return currentOffers;
|
|
}
|
|
|
|
void ClientSideMerchant::overrideOffers(MerchantRecipeList *recipeList)
|
|
{
|
|
delete currentOffers;
|
|
currentOffers = recipeList;
|
|
}
|
|
|
|
void ClientSideMerchant::notifyTrade(MerchantRecipe *activeRecipe)
|
|
{
|
|
activeRecipe->increaseUses();
|
|
}
|
|
|
|
void ClientSideMerchant::notifyTradeUpdated(shared_ptr<ItemInstance> item)
|
|
{
|
|
}
|
|
|
|
wstring ClientSideMerchant::getDisplayName()
|
|
{
|
|
return m_name;
|
|
} |