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, 11 insertions, 11 deletions

diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
index 0fa3e780..0793fc9e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
@@ -33,7 +33,7 @@ HRESULT CXuiSceneInventoryCreative::OnInit( XUIMessageInit *pInitData, BOOL &bHa
 
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
-	InventoryScreenInput *initData = static_cast<InventoryScreenInput *>(pInitData->pvInitData);
+	InventoryScreenInput *initData = (InventoryScreenInput *)pInitData->pvInitData;
 	m_iPad=initData->iPad;
 	m_bSplitscreen=initData->bSplitscreen;
 
@@ -48,7 +48,7 @@ HRESULT CXuiSceneInventoryCreative::OnInit( XUIMessageInit *pInitData, BOOL &bHa
 	}
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[initData->iPad] != nullptr )
+	if( pMinecraft->localgameModes[initData->iPad] != NULL )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[initData->iPad];
 		m_previousTutorialState = gameMode->getTutorial()->getCurrentState();
@@ -60,7 +60,7 @@ HRESULT CXuiSceneInventoryCreative::OnInit( XUIMessageInit *pInitData, BOOL &bHa
 	initData->player->awardStat(GenericStats::openInventory(), GenericStats::param_noArgs());
 
 	// 4J JEV - Item Picker Menu
-	shared_ptr<SimpleContainer> creativeContainer = std::make_shared<SimpleContainer>(0, TabSpec::MAX_SIZE + 9);
+	shared_ptr<SimpleContainer> creativeContainer = shared_ptr<SimpleContainer>(new SimpleContainer( 0, TabSpec::MAX_SIZE + 9 ));
 	itemPickerMenu = new ItemPickerMenu(creativeContainer, initData->player->inventory);
 	
 	// 4J JEV - InitDataAssociations.
@@ -95,16 +95,16 @@ HRESULT CXuiSceneInventoryCreative::OnDestroy()
 	Minecraft *pMinecraft = Minecraft::GetInstance();
 
 #ifdef _XBOX
-	if( pMinecraft->localgameModes[m_iPad] != nullptr )
+	if( pMinecraft->localgameModes[m_iPad] != NULL )
 	{
 		TutorialMode *gameMode = (TutorialMode *)pMinecraft->localgameModes[m_iPad];
-		if(gameMode != nullptr) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
+		if(gameMode != NULL) gameMode->getTutorial()->changeTutorialState(m_previousTutorialState);
 	}
 #endif
 
 	// 4J Stu - Fix for #11302 - TCR 001: Network Connectivity: Host crashed after being killed by the client while accessing a chest during burst packet loss.
 	// We need to make sure that we call closeContainer() anytime this menu is closed, even if it is forced to close by some other reason (like the player dying)	
-	if(Minecraft::GetInstance()->localplayers[m_iPad] != nullptr) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
+	if(Minecraft::GetInstance()->localplayers[m_iPad] != NULL) Minecraft::GetInstance()->localplayers[m_iPad]->closeContainer();
 	return S_OK;
 }
 
@@ -126,7 +126,7 @@ HRESULT CXuiSceneInventoryCreative::OnTransitionEnd( XUIMessageTransition *pTran
 	{
 		for(int i=0;i<eCreativeInventoryTab_COUNT;i++)
 		{
-			m_hGroupIconA[i].PlayVisualRange(specs[i]->m_icon,nullptr,specs[i]->m_icon);
+			m_hGroupIconA[i].PlayVisualRange(specs[i]->m_icon,NULL,specs[i]->m_icon);
 			XuiElementSetShow(m_hGroupIconA[i].m_hObj,TRUE);
 		}
 	}
@@ -139,16 +139,16 @@ CXuiControl* CXuiSceneInventoryCreative::GetSectionControl( ESceneSection eSecti
 	switch( eSection )
 	{
 	case eSectionInventoryCreativeUsing:
-		return static_cast<CXuiControl *>(m_useRowControl);
+		return (CXuiControl *)m_useRowControl;
 		break;
 	case eSectionInventoryCreativeSelector:
-		return static_cast<CXuiControl *>(m_containerControl);
+		return (CXuiControl *)m_containerControl;
 		break;
 	default:
 		assert( false );
 		break;
 	}
-	return nullptr;
+	return NULL;
 }
 
 CXuiCtrlSlotList* CXuiSceneInventoryCreative::GetSectionSlotList( ESceneSection eSection )
@@ -165,7 +165,7 @@ CXuiCtrlSlotList* CXuiSceneInventoryCreative::GetSectionSlotList( ESceneSection
 		assert( false );
 		break;
 	}
-	return nullptr;
+	return NULL;
 }
 
 void CXuiSceneInventoryCreative::updateTabHighlightAndText(ECreativeInventoryTabs tab)