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 a9be52c41a02d207233199e98898fe7483d7e817.

1 files changed, 5 insertions, 5 deletions

diff --git a/Minecraft.World/InventoryMenu.cpp b/Minecraft.World/InventoryMenu.cpp
index 9c6c661f..ae5d9269 100644
--- a/Minecraft.World/InventoryMenu.cpp
+++ b/Minecraft.World/InventoryMenu.cpp
@@ -28,8 +28,8 @@ InventoryMenu::InventoryMenu(shared_ptr<Inventory> inventory, bool active, Playe
 
 void InventoryMenu::_init(shared_ptr<Inventory> inventory, bool active)
 {
-	craftSlots = std::make_shared<CraftingContainer>(this, 2, 2);
-	resultSlots = std::make_shared<ResultContainer>();
+	craftSlots = shared_ptr<CraftingContainer>( new CraftingContainer(this, 2, 2) );
+	resultSlots = shared_ptr<ResultContainer>( new ResultContainer() );
 
 	this->active = active;
 	addSlot(new ResultSlot( inventory->player, craftSlots, resultSlots, 0, 144, 36));
@@ -77,7 +77,7 @@ void InventoryMenu::removed(shared_ptr<Player> player)
 	for (int i = 0; i < 4; i++)
 	{
 		shared_ptr<ItemInstance> item = craftSlots->removeItemNoUpdate(i);
-		if (item != nullptr)
+		if (item != NULL)
 		{
 			player->drop(item);
 			craftSlots->setItem(i, nullptr);
@@ -102,7 +102,7 @@ shared_ptr<ItemInstance> InventoryMenu::quickMoveStack(shared_ptr<Player> player
 	Slot *BootsSlot = slots.at(ARMOR_SLOT_START+3);
 
 
-	if (slot != nullptr && slot->hasItem())
+	if (slot != NULL && slot->hasItem())
 	{
 		shared_ptr<ItemInstance> stack = slot->getItem();
 		clicked = stack->copy();
@@ -240,7 +240,7 @@ shared_ptr<ItemInstance> InventoryMenu::clicked(int slotIndex, int buttonNum, in
 	for (int i = ARMOR_SLOT_START; i < ARMOR_SLOT_END; i++)
 	{
 		Slot *slot = slots.at(i);
-		if ( (slot==nullptr) || (!slot->hasItem()) || (slot->getItem()->getItem()->id != ironItems[i-ARMOR_SLOT_START]) )
+		if ( (slot==NULL) || (!slot->hasItem()) || (slot->getItem()->getItem()->id != ironItems[i-ARMOR_SLOT_START]) )
 		{
 			return out;
 		}