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

diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
index db1e7f0f..7544c98d 100644
--- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
+++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
@@ -289,7 +289,7 @@ void MemSect(int sect)
 void debugSaveGameDirect()
 {
 
-	C4JThread* thread = new C4JThread(&IUIScene_PauseMenu::SaveWorldThreadProc, nullptr, "debugSaveGameDirect");
+	C4JThread* thread = new C4JThread(&IUIScene_PauseMenu::SaveWorldThreadProc, NULL, "debugSaveGameDirect");
 	thread->Run();
 	thread->WaitForCompletion(1000);
 }
@@ -521,7 +521,7 @@ int main()
 	PSVitaNPToolkit::init();
 
 	// initialise the storage manager with a default save display name, a Minimum save size, and a callback for displaying the saving message
-	StorageManager.Init( 0, L"savegame.dat", "savePackName", FIFTY_ONE_MB, &CConsoleMinecraftApp::DisplaySavingMessage, (LPVOID)&app, nullptr);
+	StorageManager.Init( 0, L"savegame.dat", "savePackName", FIFTY_ONE_MB, &CConsoleMinecraftApp::DisplaySavingMessage, (LPVOID)&app, NULL);
 	StorageManager.SetDLCProductCode(app.GetProductCode());
 	StorageManager.SetProductUpgradeKey(app.GetUpgradeKey());
 	ProfileManager.SetServiceID(app.GetCommerceCategory());
@@ -625,9 +625,9 @@ int main()
 
 	StorageManager.SetDefaultImages((PBYTE)baOptionsIcon.data, baOptionsIcon.length,(PBYTE)baSaveImage.data, baSaveImage.length,(PBYTE)baSaveThumbnail.data, baSaveThumbnail.length);
 
-	if(baOptionsIcon.data!=nullptr){ delete [] baOptionsIcon.data;	}
-	if(baSaveThumbnail.data!=nullptr){	delete [] baSaveThumbnail.data; }
-	if(baSaveImage.data!=nullptr){	delete [] baSaveImage.data;	}
+	if(baOptionsIcon.data!=NULL){ delete [] baOptionsIcon.data;	}
+	if(baSaveThumbnail.data!=NULL){	delete [] baSaveThumbnail.data; }
+	if(baSaveImage.data!=NULL){	delete [] baSaveImage.data;	}
 
 	StorageManager.SetIncompleteSaveCallback(CConsoleMinecraftApp::Callback_SaveGameIncomplete, (LPVOID)&app);
 
@@ -656,7 +656,7 @@ int main()
 #endif
 
 	StorageManager.SetDLCInfoMap(app.GetSonyDLCMap());
-	app.CommerceInit(); //  MGH - moved this here so GetCommerce isn't nullptr
+	app.CommerceInit(); //  MGH - moved this here so GetCommerce isn't NULL
 
 	// 4J-PB - Kick of the check for trial or full version - requires ui to be initialised
 	app.GetCommerce()->CheckForTrialUpgradeKey();
@@ -857,7 +857,7 @@ int main()
 		else
 		{
 			MemSect(28);
-			pMinecraft->soundEngine->tick(nullptr, 0.0f);
+			pMinecraft->soundEngine->tick(NULL, 0.0f);
 			MemSect(0);
 			pMinecraft->textures->tick(true,false);
 			IntCache::Reset();
@@ -1068,7 +1068,7 @@ vector<uint8_t *> vRichPresenceStrings;
 uint8_t * AddRichPresenceString(int iID)
 {
 	uint8_t *strUtf8 = mallocAndCreateUTF8ArrayFromString(iID);
-	if( strUtf8 != nullptr )
+	if( strUtf8 != NULL )
 	{
 		vRichPresenceStrings.push_back(strUtf8);
 	}
@@ -1078,7 +1078,7 @@ uint8_t * AddRichPresenceString(int iID)
 void FreeRichPresenceStrings()
 {
 	uint8_t *strUtf8;
-	for(size_t i=0;i<vRichPresenceStrings.size();i++)
+	for(int i=0;i<vRichPresenceStrings.size();i++)
 	{
 		strUtf8=vRichPresenceStrings.at(i);
 		free(strUtf8);