Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
IUIScene_AnvilMenu::IUIScene_AnvilMenu()
|
||||
{
|
||||
m_inventory = nullptr;
|
||||
m_repairMenu = nullptr;
|
||||
m_repairMenu = NULL;
|
||||
m_itemName = L"";
|
||||
}
|
||||
|
||||
@@ -231,7 +231,7 @@ void IUIScene_AnvilMenu::handleTick()
|
||||
void IUIScene_AnvilMenu::updateItemName()
|
||||
{
|
||||
Slot *slot = m_repairMenu->getSlot(AnvilMenu::INPUT_SLOT);
|
||||
if (slot != nullptr && slot->hasItem())
|
||||
if (slot != NULL && slot->hasItem())
|
||||
{
|
||||
if (!slot->getItem()->hasCustomHoverName() && m_itemName.compare(slot->getItem()->getHoverName())==0)
|
||||
{
|
||||
@@ -245,7 +245,7 @@ void IUIScene_AnvilMenu::updateItemName()
|
||||
ByteArrayOutputStream baos;
|
||||
DataOutputStream dos(&baos);
|
||||
dos.writeUTF(m_itemName);
|
||||
Minecraft::GetInstance()->localplayers[getPad()]->connection->send(std::make_shared<CustomPayloadPacket>(CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray()));
|
||||
Minecraft::GetInstance()->localplayers[getPad()]->connection->send(shared_ptr<CustomPayloadPacket>(new CustomPayloadPacket(CustomPayloadPacket::SET_ITEM_NAME_PACKET, baos.toByteArray())));
|
||||
}
|
||||
|
||||
void IUIScene_AnvilMenu::refreshContainer(AbstractContainerMenu *container, vector<shared_ptr<ItemInstance> > *items)
|
||||
@@ -257,10 +257,10 @@ void IUIScene_AnvilMenu::slotChanged(AbstractContainerMenu *container, int slotI
|
||||
{
|
||||
if (slotIndex == AnvilMenu::INPUT_SLOT)
|
||||
{
|
||||
m_itemName = item == nullptr ? L"" : item->getHoverName();
|
||||
m_itemName = item == NULL ? L"" : item->getHoverName();
|
||||
setEditNameValue(m_itemName);
|
||||
setEditNameEditable(item != nullptr);
|
||||
if (item != nullptr)
|
||||
setEditNameEditable(item != NULL);
|
||||
if (item != NULL)
|
||||
{
|
||||
updateItemName();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user