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:
@@ -86,7 +86,7 @@ shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(shared_ptr<Player> player,
|
||||
|
||||
bool charcoalUsed = furnace->wasCharcoalUsed();
|
||||
|
||||
if (slot != nullptr && slot->hasItem())
|
||||
if (slot != NULL && slot->hasItem())
|
||||
{
|
||||
shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
clicked = stack->copy();
|
||||
@@ -112,7 +112,7 @@ shared_ptr<ItemInstance> FurnaceMenu::quickMoveStack(shared_ptr<Player> player,
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
else if (FurnaceRecipes::getInstance()->getResult(stack->getItem()->id) != nullptr)
|
||||
else if (FurnaceRecipes::getInstance()->getResult(stack->getItem()->id) != NULL)
|
||||
{
|
||||
if (!moveItemStackTo(stack, INGREDIENT_SLOT, INGREDIENT_SLOT + 1, false))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user