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:
@@ -60,7 +60,7 @@ shared_ptr<ItemInstance> BeaconMenu::quickMoveStack(shared_ptr<Player> player, i
|
||||
{
|
||||
shared_ptr<ItemInstance> clicked = nullptr;
|
||||
Slot *slot = slots.at(slotIndex);
|
||||
if (slot != nullptr && slot->hasItem())
|
||||
if (slot != NULL && slot->hasItem())
|
||||
{
|
||||
shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
clicked = stack->copy();
|
||||
@@ -127,7 +127,7 @@ BeaconMenu::PaymentSlot::PaymentSlot(shared_ptr<Container> container, int slot,
|
||||
|
||||
bool BeaconMenu::PaymentSlot::mayPlace(shared_ptr<ItemInstance> item)
|
||||
{
|
||||
if (item != nullptr)
|
||||
if (item != NULL)
|
||||
{
|
||||
return (item->id == Item::emerald_Id || item->id == Item::diamond_Id || item->id == Item::goldIngot_Id || item->id == Item::ironIngot_Id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user