Revert "Get rid of MSVC's __int64"

This reverts commit d63f79325f85e014361eb8cf1e41eaebedb1ae71.

1 files changed, 68 insertions, 68 deletions

diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 166c708d..1d90da77 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -207,7 +207,7 @@ UIScene_LoadOrJoinMenu::UIScene_LoadOrJoinMenu(int iPad, void *initData, UILayer
     bool bTexturePackAlreadyListed;
     bool bNeedToGetTPD=false;
     Minecraft *pMinecraft = Minecraft::GetInstance();
-    int texturePacksCount = pMinecraft->skins->getTexturePackCount();
+    int texturePacksCount = pMinecraft->skins->getTexturePackCount();	
 
     for(unsigned int i = 0; i < app.GetDLCInfoTexturesOffersCount(); ++i)
     {
@@ -311,7 +311,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
     // update the tooltips
     // if the saves list has focus, then we should show the Delete Save tooltip
     // if the games list has focus, then we should the the View Gamercard tooltip
-    int iRB=-1;
+    int iRB=-1;	
     int iY = -1;
     int iLB = -1;
     int iX=-1;
@@ -322,7 +322,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
     else if (DoesSavesListHaveFocus())
     {
         if((m_iDefaultButtonsC > 0) && (m_iSaveListIndex >= m_iDefaultButtonsC))
-        {
+        {		
             if(StorageManager.GetSaveDisabled())
             {
                 iRB=IDS_TOOLTIPS_DELETESAVE;
@@ -378,7 +378,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
         // Is there a save from PS3 or PSVita available?
 		// Sony asked that this be displayed at all times so users are aware of the functionality. We'll display some text when there's no save available
         //if(app.getRemoteStorage()->saveIsAvailable())
-		{
+		{		
 			bool bSignedInLive = ProfileManager.IsSignedInLive(m_iPad);
 			if(bSignedInLive)
 			{
@@ -393,7 +393,7 @@ void UIScene_LoadOrJoinMenu::updateTooltips()
     ui.SetTooltips( DEFAULT_XUI_MENU_USER, IDS_TOOLTIPS_SELECT, IDS_TOOLTIPS_BACK, iX, iY,-1,-1,iLB,iRB);
 }
 
-//
+// 
 void UIScene_LoadOrJoinMenu::Initialise()
 {
     m_iSaveListIndex = 0;
@@ -481,7 +481,7 @@ void UIScene_LoadOrJoinMenu::handleGainFocus(bool navBack)
     {
         app.SetLiveLinkRequired( true );
 
-        m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad);
+        m_bMultiplayerAllowed = ProfileManager.IsSignedInLive( m_iPad ) && ProfileManager.AllowedToPlayMultiplayer(m_iPad); 
 
         // re-enable button presses
         m_bIgnoreInput=false;
@@ -825,7 +825,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
         m_pSaveDetails=StorageManager.ReturnSavesInfo();
         if(m_pSaveDetails==NULL)
         {
-            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
+            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save"); 
         }
 #endif
 
@@ -874,7 +874,7 @@ void UIScene_LoadOrJoinMenu::GetSaveInfo()
         m_pSaveDetails=StorageManager.ReturnSavesInfo();
         if(m_pSaveDetails==NULL)
         {
-            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save");
+            C4JStorage::ESaveGameState eSGIStatus= StorageManager.GetSavesInfo(m_iPad,NULL,this,"save"); 
         }
 
 #if TO_BE_IMPLEMENTED
@@ -918,7 +918,7 @@ void UIScene_LoadOrJoinMenu::AddDefaultButtons()
 				continue;
 			}
 		}
-
+		
 		m_generators.push_back(levelGen);
 		m_buttonListSaves.addItem(levelGen->getWorldName());
 
@@ -969,7 +969,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
     case ACTION_MENU_X:
 #if TO_BE_IMPLEMENTED
         // Change device
-        // Fix for #12531 - TCR 001: BAS Game Stability: When a player selects to change a storage
+        // Fix for #12531 - TCR 001: BAS Game Stability: When a player selects to change a storage 
         // device, and repeatedly backs out of the SD screen, disconnects from LIVE, and then selects a SD, the title crashes.
         m_bIgnoreInput=true;
         StorageManager.SetSaveDevice(&CScene_MultiGameJoinLoad::DeviceSelectReturned,this,true);
@@ -987,7 +987,7 @@ void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pr
 		{
 			bool bSignedInLive = ProfileManager.IsSignedInLive(iPad);
 			if(bSignedInLive)
-			{
+			{			
 				LaunchSaveTransfer();
 			}
 		}
@@ -1171,7 +1171,7 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
     UIScene_LoadOrJoinMenu *pClass=(UIScene_LoadOrJoinMenu *)lpParam;
 	pClass->m_bIgnoreInput=false;
     if (bRes)
-    {
+    {	
         uint16_t ui16Text[128];
         ZeroMemory(ui16Text, 128 * sizeof(uint16_t) );
         InputManager.GetText(ui16Text);
@@ -1184,13 +1184,13 @@ int UIScene_LoadOrJoinMenu::KeyboardCompleteWorldNameCallback(LPVOID lpParam,boo
             StorageManager.RenameSaveData(pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC, ui16Text,&UIScene_LoadOrJoinMenu::RenameSaveDataReturned,pClass);
 #endif
         }
-        else
+        else 
         {
             pClass->m_bIgnoreInput=false;
             pClass->updateTooltips();
         }
-    }
-    else
+    } 
+    else 
     {
         pClass->m_bIgnoreInput=false;
         pClass->updateTooltips();
@@ -1204,13 +1204,13 @@ void UIScene_LoadOrJoinMenu::handleInitFocus(F64 controlId, F64 childId)
     app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleInitFocus - %d , %d\n", (int)controlId, (int)childId);
 }
 
-void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId)
+void UIScene_LoadOrJoinMenu::handleFocusChange(F64 controlId, F64 childId) 
 {
     app.DebugPrintf(app.USER_SR, "UIScene_LoadOrJoinMenu::handleFocusChange - %d , %d\n", (int)controlId, (int)childId);
-
+    
 	switch((int)controlId)
 	{
-	case eControl_GamesList:
+	case eControl_GamesList:	
 		m_iGameListIndex = childId;
 		m_buttonListGames.updateChildFocus( (int) childId );
 		break;
@@ -1246,7 +1246,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
             ui.PlayUISFX(eSFX_Press);
 
             if((int)childId == JOIN_LOAD_CREATE_BUTTON_INDEX)
-            {
+            {		
                 app.SetTutorialMode( false );
 
                 m_controlJoinTimer.setVisible( false );
@@ -1298,7 +1298,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
                 }
                 else
 #endif
-                {
+                {		
                     app.SetTutorialMode( false );
 
                     if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
@@ -1340,7 +1340,7 @@ void UIScene_LoadOrJoinMenu::handlePress(F64 controlId, F64 childId)
     case eControl_GamesList:
         {
             m_bIgnoreInput=true;
-
+			
 			m_eAction = eAction_JoinGame;
 
             //CD - Added for audio
@@ -1375,7 +1375,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 
 		bool bPlayStationPlus=true;
 		int iPadWithNoPlaystationPlus=0;
-		bool isSignedInLive = true;
+		bool isSignedInLive = true;				
 		int iPadNotSignedInLive = -1;
 		for(unsigned int i = 0; i < XUSER_MAX_COUNT; ++i)
 		{
@@ -1458,7 +1458,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 			SceNpCommerceDialogParam param;
 			sceNpCommerceDialogParamInitialize(&param);
 			param.mode=SCE_NP_COMMERCE_DIALOG_MODE_PLUS;
-			param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY;
+			param.features = SCE_NP_PLUS_FEATURE_REALTIME_MULTIPLAY; 
 			param.userId = ProfileManager.getUserID(iPadWithNoPlaystationPlus);
 
 			iResult=sceNpCommerceDialogOpen(&param);
@@ -1532,7 +1532,7 @@ void UIScene_LoadOrJoinMenu::CheckAndJoinGame(int gameIndex)
 }
 
 void UIScene_LoadOrJoinMenu::LoadLevelGen(LevelGenerationOptions *levelGen)
-{
+{	
     // Load data from disc
     //File saveFile( L"Tutorial\\Tutorial" );
     //LoadSaveFromDisk(&saveFile);
@@ -1630,7 +1630,7 @@ void UIScene_LoadOrJoinMenu::UpdateGamesList()
 
     // if the saves list has focus, then we should show the Delete Save tooltip
     // if the games list has focus, then we should show the View Gamercard tooltip
-    int iRB=-1;
+    int iRB=-1;	
     int iY = -1;
     int iX=-1;
 
@@ -1854,7 +1854,7 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id)
 
                             if(iImageDataBytes!=0)
                             {
-                                // set the image
+                                // set the image	
                                 registerSubstitutionTexture(textureName,pbImageData,iImageDataBytes,true);
                                 m_iConfigA[i]=-1;
                             }
@@ -1867,7 +1867,7 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id)
             bool bAllDone=true;
             for(int i=0;i<m_iTexturePacksNotInstalled;i++)
             {
-                if(m_iConfigA[i]!=-1)
+                if(m_iConfigA[i]!=-1) 
                 {
                     bAllDone = false;
                 }
@@ -1882,13 +1882,13 @@ void UIScene_LoadOrJoinMenu::handleTimerComplete(int id)
 
         }
         break;
-#endif
+#endif	
     }
 
 }
 
 void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform savePlatform /*= SAVE_FILE_PLATFORM_LOCAL*/)
-{
+{	
     // we'll only be coming in here when the tutorial is loaded now
 
     StorageManager.ResetSaveData();
@@ -1896,7 +1896,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
     // Make our next save default to the name of the level
     StorageManager.SetSaveTitle(saveFile->getName().c_str());
 
-    int64_t fileSize = saveFile->length();
+    __int64 fileSize = saveFile->length();
     FileInputStream fis(*saveFile);
     byteArray ba(fileSize);
     fis.read(ba);
@@ -1946,7 +1946,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromDisk(File *saveFile, ESavePlatform save
 
 #ifdef SONY_REMOTE_STORAGE_DOWNLOAD
 void UIScene_LoadOrJoinMenu::LoadSaveFromCloud()
-{
+{	
 
     wchar_t wFileName[128];
     mbstowcs(wFileName, app.getRemoteStorage()->getLocalFilename(), strlen(app.getRemoteStorage()->getLocalFilename())+1); // plus null
@@ -1960,7 +1960,7 @@ void UIScene_LoadOrJoinMenu::LoadSaveFromCloud()
     mbstowcs(wSaveName, app.getRemoteStorage()->getSaveNameUTF8(), strlen(app.getRemoteStorage()->getSaveNameUTF8())+1); // plus null
     StorageManager.SetSaveTitle(wSaveName);
 
-    int64_t fileSize = cloudFile.length();
+    __int64 fileSize = cloudFile.length();
     FileInputStream fis(cloudFile);
     byteArray ba(fileSize);
     fis.read(ba);
@@ -2019,7 +2019,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDialogReturned(void *pParam,int iPad,C4JSt
 	// Check that we have a valid save selected (can get a bad index if the save list has been refreshed)
 	bool validSelection= pClass->m_iDefaultButtonsC != 0 && pClass->m_iSaveListIndex >= pClass->m_iDefaultButtonsC;
 
-    if(result==C4JStorage::EMessage_ResultDecline && validSelection)
+    if(result==C4JStorage::EMessage_ResultDecline && validSelection) 
     {
         if(app.DebugSettingsOn() && app.GetLoadSavesFromFolderEnabled())
         {
@@ -2049,7 +2049,7 @@ int UIScene_LoadOrJoinMenu::DeleteSaveDataReturned(LPVOID lpParam,bool bRes)
 		if(bRes)
 		{
 			// wipe the list and repopulate it
-			pClass->m_iState=e_SavesRepopulateAfterDelete;
+			pClass->m_iState=e_SavesRepopulateAfterDelete;		
 		}
 		else pClass->m_bIgnoreInput=false;
 
@@ -2169,7 +2169,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
     UIScene_LoadOrJoinMenu *pClass = (UIScene_LoadOrJoinMenu *)pParam;
 
     // Exit with or without saving
-    if(result==C4JStorage::EMessage_ResultAccept)
+    if(result==C4JStorage::EMessage_ResultAccept) 
     {
         // we need to enable background downloading for the DLC
         XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
@@ -2194,9 +2194,9 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 #endif
 
 
-#if defined _XBOX_ONE
+#if defined _XBOX_ONE		
 		if(ProfileManager.IsSignedIn(iPad))
-		{
+		{	
 			if (ProfileManager.IsSignedInLive(iPad))
 			{
 				wstring ProductId;
@@ -2205,13 +2205,13 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(void *pParam,int iPad,C4JS
 				StorageManager.InstallOffer(1,(WCHAR *)ProductId.c_str(),NULL,NULL);
 			}
 			else
-			{
+			{	
 				// 4J-JEV: Fix for XB1: #165863 - XR-074: Compliance: With no active network connection user is unable to convert from Trial to Full texture pack and is not messaged why.
 				UINT uiIDA[1] = { IDS_CONFIRM_OK };
-				ui.RequestMessageBox(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad, NULL, NULL, app.GetStringTable());
+				ui.RequestMessageBox(IDS_PRO_NOTONLINE_TITLE, IDS_PRO_XBOXLIVE_NOTIFICATION, uiIDA, 1, iPad, NULL, NULL, app.GetStringTable()); 
 			}
 		}
-#endif
+#endif	
 
     }
     pClass->m_bIgnoreInput=false;
@@ -2223,7 +2223,7 @@ int UIScene_LoadOrJoinMenu::MustSignInReturnedPSN(void *pParam,int iPad,C4JStora
 {
     UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
 
-	if(result==C4JStorage::EMessage_ResultAccept)
+	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 #if defined(__PS3__)
 		SQRNetworkManager_PS3::AttemptPSNSignIn(&UIScene_LoadOrJoinMenu::PSN_SignInReturned, pClass);
@@ -2442,7 +2442,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				DWORD dwDataSizeSaveImage=0;
 
 				StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
-				StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);		// Get the default save image (as set by SetDefaultImages) for use on saving games that
+				StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);		// Get the default save image (as set by SetDefaultImages) for use on saving games that 
 
 				BYTE bTextMetadata[88];
 				ZeroMemory(bTextMetadata,88);
@@ -2470,7 +2470,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 			{
 				// we can't cancel here, we need the saves info so we can delete the file
 				if(pClass->m_saveTransferDownloadCancelled)
-				{
+				{	
 					WCHAR wcTemp[256];
 					swprintf(wcTemp,256, app.GetString(IDS_CANCEL));		// MGH - should change this string to "cancelling download"
 					m_wstrStageText=wcTemp;
@@ -2485,7 +2485,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 			break;
 		case eSaveTransfer_GettingSavesInfo:
 			if(pClass->m_saveTransferDownloadCancelled)
-			{
+			{	
 				WCHAR wcTemp[256];
 				swprintf(wcTemp,256, app.GetString(IDS_CANCEL));		// MGH - should change this string to "cancelling download"
 				m_wstrStageText=wcTemp;
@@ -2602,7 +2602,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 					DWORD dwDataSizeSaveImage=0;
 
 					StorageManager.GetDefaultSaveImage(&pbDataSaveImage, &dwDataSizeSaveImage);			// Get the default save thumbnail (as set by SetDefaultImages) for use on saving games t
-					StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);		// Get the default save image (as set by SetDefaultImages) for use on saving games that
+					StorageManager.GetDefaultSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);		// Get the default save image (as set by SetDefaultImages) for use on saving games that 
 
 					BYTE bTextMetadata[88];
 					ZeroMemory(bTextMetadata,88);
@@ -2613,12 +2613,12 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				}
 
 
-#ifdef SPLIT_SAVES
+#ifdef SPLIT_SAVES		
                 ConsoleSaveFileOriginal oldFormatSave( wSaveName, ba.data, ba.length, false, app.getRemoteStorage()->getSavePlatform() );
                 pSave = new ConsoleSaveFileSplit( &oldFormatSave, false, pMinecraft->progressRenderer );
 
                 pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING);
-                pSave->Flush(false,false);
+                pSave->Flush(false,false);	
                 pClass->m_eSaveTransferState = eSaveTransfer_Saving;
 #else
                 pSave = new ConsoleSaveFileOriginal( wSaveName, ba.data, ba.length, false, app.getRemoteStorage()->getSavePlatform() );
@@ -2654,7 +2654,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 
 				delete pSave;
 
-
+            
 				pMinecraft->progressRenderer->progressStage(IDS_PROGRESS_SAVING_TO_DISC);
 				pClass->m_eSaveTransferState = eSaveTransfer_Succeeded;
 			}
@@ -2668,7 +2668,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_CONFIRM_OK;
 				app.getRemoteStorage()->waitForStorageManagerIdle();	// wait for everything to complete before we hand control back to the player
-				ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_DOWNLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass, app.GetStringTable());
+				ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_DOWNLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass, app.GetStringTable());			
 				pClass->m_eSaveTransferState = eSaveTransfer_Finished;
 			}
 			break;
@@ -2683,7 +2683,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				if(bSaveFileCreated)
 				{
 					if(pClass->m_saveTransferDownloadCancelled)
-					{
+					{	
 						WCHAR wcTemp[256];
 					swprintf(wcTemp,256, app.GetString(IDS_CANCEL));		// MGH - should change this string to "cancelling download"
 						m_wstrStageText=wcTemp;
@@ -2743,7 +2743,7 @@ int UIScene_LoadOrJoinMenu::DownloadSonyCrossSaveThreadProc( LPVOID lpParameter
 				{
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_CONFIRM_OK;
-					ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_DOWNLOADFAILED, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass, app.GetStringTable());
+					ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_DOWNLOAD, IDS_SAVE_TRANSFER_DOWNLOADFAILED, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveFinishedCallback,pClass, app.GetStringTable());			
 					pClass->m_eSaveTransferState = eSaveTransfer_Finished;
 				}
 				if(bSaveFileCreated)		// save file has been created, then deleted.
@@ -2887,7 +2887,7 @@ int UIScene_LoadOrJoinMenu::UploadSonyCrossSaveThreadProc( LPVOID lpParameter )
 			{
 				UINT uiIDA[1];
 				uiIDA[0]=IDS_CONFIRM_OK;
-				ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass, app.GetStringTable());
+				ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADCOMPLETE, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass, app.GetStringTable());			
 				pClass->m_eSaveUploadState = esaveUpload_Finished;
 			}
 			break;
@@ -2904,7 +2904,7 @@ int UIScene_LoadOrJoinMenu::UploadSonyCrossSaveThreadProc( LPVOID lpParameter )
 				{
 					UINT uiIDA[1];
 					uiIDA[0]=IDS_CONFIRM_OK;
-					ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADFAILED, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass, app.GetStringTable());
+					ui.RequestMessageBox( IDS_TOOLTIPS_SAVETRANSFER_UPLOAD, IDS_SAVE_TRANSFER_UPLOADFAILED, uiIDA,1,ProfileManager.GetPrimaryPad(),CrossSaveUploadFinishedCallback,pClass, app.GetStringTable());			
 					pClass->m_eSaveUploadState = esaveUpload_Finished;
 				}
 			}
@@ -2953,7 +2953,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferDialogReturned(void *pParam,int iPad,C4J
 {
 	UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
 	// results switched for this dialog
-	if(result==C4JStorage::EMessage_ResultAccept)
+	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 		// upload the save
 		pClass->LaunchSaveUpload();
@@ -3062,13 +3062,13 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
                     ByteArrayInputStream bais(UIScene_LoadOrJoinMenu::s_transferData);
                     DataInputStream dis(&bais);
 
-                    wstring saveTitle = dis.readUTF();
+                    wstring saveTitle = dis.readUTF();				
                     StorageManager.SetSaveTitle(saveTitle.c_str());
 
                     wstring saveUniqueName = dis.readUTF();
 
 					// 4J Stu - Don't set this any more. We added it so that we could share the ban list data for this save
-					// However if the player downloads the same save multiple times, it will overwrite the previous version
+					// However if the player downloads the same save multiple times, it will overwrite the previous version 
 					// with that filname, and they could have made changes to it.
                     //StorageManager.SetSaveUniqueFilename((wchar_t *)saveUniqueName.c_str());
 
@@ -3091,13 +3091,13 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
             case eSaveTransferFile_SaveData:
                 {
 #ifdef SPLIT_SAVES
-					if(!pStateContainer->m_bSaveTransferCancelled)
+					if(!pStateContainer->m_bSaveTransferCancelled) 
 					{
 						ConsoleSaveFileOriginal oldFormatSave( L"Temp name", UIScene_LoadOrJoinMenu::s_transferData.data, UIScene_LoadOrJoinMenu::s_transferData.length, false, SAVE_FILE_PLATFORM_X360 );
 						pSave = new ConsoleSaveFileSplit( &oldFormatSave, false, pMinecraft->progressRenderer );
 
 						pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING);
-						if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false);
+						if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false);	
 					}
                     pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Saving;
 
@@ -3118,7 +3118,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
             pSave->ConvertToLocalPlatform();
 
             pMinecraft->progressRenderer->progressStage(IDS_SAVETRANSFER_STAGE_SAVING);
-            if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false);
+            if(!pStateContainer->m_bSaveTransferCancelled) pSave->Flush(false,false);			
 
             pStateContainer->m_iProgress+=1;
             if(pStateContainer->m_iProgress==101)
@@ -3134,8 +3134,8 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
             // On Durango/Orbis, we need to wait for all the asynchronous saving processes to complete before destroying the levels, as that will ultimately delete
             // the directory level storage & therefore the ConsoleSaveSplit instance, which needs to be around until all the sub files have completed saving.
 #if defined(_DURANGO) || defined(__ORBIS__)
-			pMinecraft->progressRenderer->progressStage(IDS_PROGRESS_SAVING_TO_DISC);
-
+			pMinecraft->progressRenderer->progressStage(IDS_PROGRESS_SAVING_TO_DISC);            
+			
 			while(StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle )
             {
                 Sleep(10);
@@ -3150,9 +3150,9 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 #ifdef _XBOX_ONE
 			pMinecraft->progressRenderer->progressStage(IDS_SAVE_TRANSFER_DOWNLOAD_AND_CONVERT_COMPLETE);
 #endif
-
+			
             pStateContainer->m_eSaveTransferState=C4JStorage::eSaveTransfer_Idle;
-
+			
 			 // wipe the list and repopulate it
 			 if(!pStateContainer->m_bSaveTransferCancelled) pStateContainer->m_pClass->m_iState=e_SavesRepopulateAfterTransferDownload;
 
@@ -3192,7 +3192,7 @@ int UIScene_LoadOrJoinMenu::DownloadXbox360SaveThreadProc( LPVOID lpParameter )
 }
 
 void UIScene_LoadOrJoinMenu::RequestFileSize( SaveTransferStateContainer *pClass, wchar_t *filename )
-{
+{	
     Minecraft *pMinecraft=Minecraft::GetInstance();
 
     // get the save file size
@@ -3298,7 +3298,7 @@ int UIScene_LoadOrJoinMenu::SaveTransferUpdateProgress(LPVOID lpParam,unsigned l
 
     if(pClass->m_bSaveTransferCancelled) // was cancelled
     {
-        pMinecraft->progressRenderer->progressStage(IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING);
+        pMinecraft->progressRenderer->progressStage(IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING);		
         swprintf(wcTemp,app.GetString(IDS_SAVE_TRANSFER_DOWNLOAD_CANCELLING));
         m_wstrStageText=wcTemp;
         pMinecraft->progressRenderer->progressStage( m_wstrStageText );
@@ -3373,7 +3373,7 @@ int UIScene_LoadOrJoinMenu::CopySaveDialogReturned(void *pParam,int iPad,C4JStor
 {
     UIScene_LoadOrJoinMenu* pClass = (UIScene_LoadOrJoinMenu*)pParam;
 
-	if(result==C4JStorage::EMessage_ResultAccept)
+	if(result==C4JStorage::EMessage_ResultAccept) 
 	{
 
 		LoadingInputParams *loadingParams = new LoadingInputParams();
@@ -3418,7 +3418,7 @@ int UIScene_LoadOrJoinMenu::CopySaveThreadProc( LPVOID lpParameter )
 		ui.LeaveCallbackIdCriticalSection();
 		// Copy save data takes two callbacks - one for completion, and one for progress. The progress callback also lets us cancel the operation, if we return false.
 		StorageManager.CopySaveData(&pClass->m_pSaveDetails->SaveInfoA[pClass->m_iSaveListIndex - pClass->m_iDefaultButtonsC],UIScene_LoadOrJoinMenu::CopySaveDataReturned,UIScene_LoadOrJoinMenu::CopySaveDataProgress,lpParameter);
-
+			
 		bool bContinue = true;
 		do
 		{
@@ -3455,7 +3455,7 @@ int UIScene_LoadOrJoinMenu::CopySaveDataReturned(LPVOID lpParam, bool success, C
 		{
 			pClass->m_bCopying = false;
 			// wipe the list and repopulate it
-			pClass->m_iState=e_SavesRepopulateAfterDelete;
+			pClass->m_iState=e_SavesRepopulateAfterDelete;		
 			ui.LeaveCallbackIdCriticalSection();
 		}
 		else