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

diff --git a/Minecraft.Client/Xbox/Social/SocialManager.cpp b/Minecraft.Client/Xbox/Social/SocialManager.cpp
index b89fda70..b7a108bc 100644
--- a/Minecraft.Client/Xbox/Social/SocialManager.cpp
+++ b/Minecraft.Client/Xbox/Social/SocialManager.cpp
@@ -67,14 +67,14 @@ CSocialManager::CSocialManager()
 
 // WESTY : Not sure if we even need to get social access key!
 /*
-	m_pAccessKeyText = nullptr; 
+	m_pAccessKeyText = NULL; 
 	m_dwAccessKeyTextSize = 0;
 */
 
-	m_pMainImageBuffer = nullptr;
+	m_pMainImageBuffer = NULL;
 	m_dwMainImageBufferSize = 0;
 
-	m_PostPreviewImage.pBytes = nullptr;
+	m_PostPreviewImage.pBytes = NULL;
 	m_dwCurrRequestUser = -1;
 
 	ZeroMemory(m_wchTitleA,sizeof(WCHAR)*MAX_SOCIALPOST_CAPTION);
@@ -304,14 +304,14 @@ bool CSocialManager::AreAllUsersAllowedToPostImages()
 void CSocialManager::DestroyMainPostImage()
 {
 	delete [] m_PostImageParams.pFullImage;
-	m_PostImageParams.pFullImage=nullptr;
+	m_PostImageParams.pFullImage=NULL;
 	m_dwMainImageBufferSize=0;
  }
 
 void CSocialManager::DestroyPreviewPostImage()
 {
 	XPhysicalFree( (void *)m_PostPreviewImage.pBytes );
-	m_PostPreviewImage.pBytes = nullptr;
+	m_PostPreviewImage.pBytes = NULL;
 }
 
 void CSocialManager::SetSocialPostText(LPCWSTR pwchTitle, LPCWSTR pwchCaption, LPCWSTR pwchDesc)
@@ -459,7 +459,7 @@ bool CSocialManager::PostImageToSocialNetwork( ESocialNetwork eSocialNetwork, DW
 
 	bool bResult = false;
 
-	PBYTE pbData=nullptr;
+	PBYTE pbData=NULL;
 	DWORD dwDataSize;
 
 	app.GetScreenshot(dwUserIndex,&pbData,&dwDataSize);
@@ -536,10 +536,10 @@ bool CSocialManager::GetSocialNetworkAccessKey( ESocialNetwork eSocialNetwork, D
 	DWORD dwResult;
 
 	// Ensure that we free any previously used access key buffer.
-	if ( m_pAccessKeyText != nullptr )
+	if ( m_pAccessKeyText != NULL )
 	{
 		delete [] m_pAccessKeyText;
-		m_pAccessKeyText = nullptr;
+		m_pAccessKeyText = NULL;
 	}
 
 	// Get social network ID and permissions.
@@ -554,39 +554,39 @@ bool CSocialManager::GetSocialNetworkAccessKey( ESocialNetwork eSocialNetwork, D
 	{
 		if ( bUsingKinect )
 		{
-			dwResult = XShowNuiSocialGetUserToken( dwUserTrackingIndex, dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), nullptr );
+			dwResult = XShowNuiSocialGetUserToken( dwUserTrackingIndex, dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), NULL );
 
 			// If buffer for key text was not large enough, reallocate buffer that is large enough and try again.
 			if ( dwResult == ERROR_INSUFFICIENT_BUFFER )
 			{
 				delete [] m_pAccessKeyText;
 				m_pAccessKeyText = new wchar_t[ m_dwAccessKeyTextSize ];
-				dwResult = XShowNuiSocialGetUserToken( dwUserTrackingIndex, dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), nullptr );
+				dwResult = XShowNuiSocialGetUserToken( dwUserTrackingIndex, dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), NULL );
 			}
 		}
 		else // using standard controller interface.
 		{
-			dwResult = XShowSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), nullptr );
+			dwResult = XShowSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), NULL );
 
 			// If buffer for key text was not large enough, reallocate buffer that is large enough and try again.
 			if ( dwResult == ERROR_INSUFFICIENT_BUFFER )
 			{
 				delete [] m_pAccessKeyText;
 				m_pAccessKeyText = new wchar_t[ m_dwAccessKeyTextSize ];
-				dwResult = XShowSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), nullptr );
+				dwResult = XShowSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), NULL );
 			}
 		}
 	}
 	else // we are trying to obtain cached user access key.
 	{
-		dwResult = XSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), nullptr );
+		dwResult = XSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), NULL );
 
 		// If buffer for key text was not large enough, reallocate buffer that is large enough and try again.
 		if ( dwResult == ERROR_INSUFFICIENT_BUFFER )
 		{
 			delete [] m_pAccessKeyText;
 			m_pAccessKeyText = new wchar_t[ m_dwAccessKeyTextSize ];
-			dwResult = XSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), nullptr );
+			dwResult = XSocialGetUserToken( dwUserIndex, dwSocialNetworkID, pRequiredPermissions, m_pAccessKeyText, &( m_dwAccessKeyTextSize ), NULL );
 		}
 	}