Merge remote-tracking branch 'origin/main' into 8thgenautosave

Minecraft.Client/Common/Buildsteps/PS3-postbuild.ps1

@@ -59,7 +59,7 @@ $fileCopies = @(
 )
 
 foreach ($copy in $fileCopies) {
-    $src = Join-Path $ProjectDir $copy.Source
+    $src = $copy.Source
     $dst = Join-Path $OutDir $copy.Dest
     if (Test-Path $src) {
         Copy-Item -Path $src -Destination $dst -Force

Minecraft.Client/Common/Consoles_App.cpp

@@ -2388,7 +2388,7 @@ void CMinecraftApp::ClearGameSettingsChangedFlag(int iPad)
 // Remove the debug settings in the content package build
 //
 ////////////////////////////
-#ifdef _DEBUG_MENUS_ENABLED
+#ifndef _DEBUG_MENUS_ENABLED
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	return 0;
@@ -2401,9 +2401,7 @@ void CMinecraftApp::SetGameSettingsDebugMask(int iPad, unsigned int uiVal)
 void CMinecraftApp::ActionDebugMask(int iPad,bool bSetAllClear)
 {
 }
-
 #else
-
 unsigned int CMinecraftApp::GetGameSettingsDebugMask(int iPad,bool bOverridePlayer) //bOverridePlayer is to force the send for the server to get the read options
 {
 	if(iPad==-1)
@@ -3846,9 +3844,9 @@ void CMinecraftApp::HandleXuiActions(void)
 			case eAppAction_SetDefaultOptions:
 				SetAction(i,eAppAction_Idle);
 #if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
-				SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
+					SetDefaultOptions((C4JStorage::PROFILESETTINGS *)param,i);		
 #else
-				SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
+					SetDefaultOptions((C_4JProfile::PROFILESETTINGS *)param,i);		
 #endif
 
 				// if the profile data has been changed, then force a profile write
@@ -6457,7 +6455,7 @@ wstring CMinecraftApp::FormatHTMLString(int iPad, const wstring &desc, int shado
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_DOWN*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_DOWN		) );
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_RIGHT*}",	GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_RIGHT		) );	
 	text = replaceAll(text, L"{*CONTROLLER_ACTION_DPAD_LEFT*}",		GetActionReplacement(iPad,MINECRAFT_ACTION_DPAD_LEFT		) );
-#if defined _XBOX_ONE || defined __PSVITA__
+#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
 	text = replaceAll(text, L"{*CONTROLLER_VK_START*}",			GetVKReplacement(VK_PAD_START		) );
 	text = replaceAll(text, L"{*CONTROLLER_VK_BACK*}",			GetVKReplacement(VK_PAD_BACK		) );
 #endif
@@ -6580,8 +6578,16 @@ wstring CMinecraftApp::GetActionReplacement(int iPad, unsigned char ucAction)
 #ifdef __PS3__
 	int size = 30;
 #elif defined _WIN64
-	int size = 45;
-	if(ui.getScreenWidth() < 1920) size = 30;
+	int size;
+
+	if(ui.getScreenWidth() >= 1920)
+	{
+		size = 45;
+	}
+	else
+	{
+		size = 30;
+	}
 #else
 	int size = 45;
 #endif
@@ -6693,7 +6699,7 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 	case VK_PAD_RTHUMB_DOWNLEFT :
 		replacement = L"ButtonRightStick";
 		break;
-#if defined _XBOX_ONE || defined __PSVITA__
+#if defined _XBOX_ONE || defined __PSVITA__ || defined _WINDOWS64
 	case VK_PAD_START:
 		replacement = L"ButtonStart";
 		break;
@@ -6709,8 +6715,16 @@ wstring CMinecraftApp::GetVKReplacement(unsigned int uiVKey)
 #ifdef __PS3__
 	int size = 30;
 #elif defined _WIN64
-	int size = 45;
-	if(ui.getScreenWidth() < 1920) size = 30;
+	int size;
+
+	if(ui.getScreenWidth() >= 1920)
+	{
+		size = 45;
+	}
+	else
+	{
+		size = 30;
+	}
 #else
 	int size = 45;
 #endif
@@ -6740,8 +6754,16 @@ wstring CMinecraftApp::GetIconReplacement(unsigned int uiIcon)
 #ifdef __PS3__
 	int size = 22;
 #elif defined _WIN64
-	int size = 33;
-	if(ui.getScreenWidth() < 1920) size = 22;
+	int size; 
+
+	if(ui.getScreenWidth() >= 1920)
+	{
+		int size = 33;
+	}
+	else
+	{
+		int size = 22;
+	}
 #else
 	int size = 33;
 #endif

Minecraft.Client/Common/Consoles_App.h

@@ -851,15 +851,6 @@ public:
 	static DWORD getSkinIdFromPath(const wstring &skin);
 	static wstring getSkinPathFromId(DWORD skinId);
 
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile)=0;
-	virtual int LoadLocalTMSFile(WCHAR *wchTMSFile, eFileExtensionType eExt)=0;
-	virtual void FreeLocalTMSFiles(eTMSFileType eType)=0;
-	virtual int GetLocalTMSFileIndex(WCHAR *wchTMSFile,bool bFilenameIncludesExtension,eFileExtensionType eEXT)=0;
-
-	virtual bool GetTMSGlobalFileListRead() { return true;}
-	virtual bool GetTMSDLCInfoRead() { return true;}
-	virtual bool GetTMSXUIDsFileRead() { return true;}
-
 	bool GetBanListRead(int iPad) { return m_bRead_BannedListA[iPad];}
 	void SetBanListRead(int iPad,bool bVal) { m_bRead_BannedListA[iPad]=bVal;}
 	void ClearBanList(int iPad) { BannedListA[iPad].pBannedList=NULL;BannedListA[iPad].dwBytes=0;}