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:
@@ -69,7 +69,7 @@ shared_ptr<ItemInstance> BrewingStandMenu::quickMoveStack(shared_ptr<Player> pla
|
||||
Slot *PotionSlot2 = slots.at(BOTTLE_SLOT_START+1);
|
||||
Slot *PotionSlot3 = slots.at(BOTTLE_SLOT_START+2);
|
||||
|
||||
if (slot != nullptr && slot->hasItem())
|
||||
if (slot != NULL && slot->hasItem())
|
||||
{
|
||||
shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
clicked = stack->copy();
|
||||
@@ -199,7 +199,7 @@ bool BrewingStandMenu::PotionSlot::mayCombine(shared_ptr<ItemInstance> second)
|
||||
|
||||
bool BrewingStandMenu::PotionSlot::mayPlaceItem(shared_ptr<ItemInstance> item)
|
||||
{
|
||||
return item != nullptr && (item->id == Item::potion_Id || item->id == Item::glassBottle_Id);
|
||||
return item != NULL && (item->id == Item::potion_Id || item->id == Item::glassBottle_Id);
|
||||
}
|
||||
|
||||
|
||||
@@ -210,7 +210,7 @@ BrewingStandMenu::IngredientsSlot::IngredientsSlot(shared_ptr<Container> contain
|
||||
|
||||
bool BrewingStandMenu::IngredientsSlot::mayPlace(shared_ptr<ItemInstance> item)
|
||||
{
|
||||
if (item != nullptr)
|
||||
if (item != NULL)
|
||||
{
|
||||
if (PotionBrewing::SIMPLIFIED_BREWING)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user