fix: PS-Vita and Xbox 360 compile errors

This commit is contained in:
2026-09-08 16:33:35 +01:00
parent 886c0c8e29
commit 8970406c7f
4 changed files with 10 additions and 10 deletions
+6 -6
View File
@@ -205,7 +205,7 @@ CMinecraftApp::CMinecraftApp()
m_bUseDPadForDebug = true;
#endif
#if !(defined _WINDOWS64)
#if !(defined _WINDOWS64 || _XBOX)
for(int i=0;i<XUSER_MAX_COUNT;i++)
{
m_eOptionsStatusA[i]=C4JStorage::eOptions_Callback_Idle;
@@ -729,7 +729,7 @@ void CMinecraftApp::InitGameSettings()
{
for(int i=0;i<XUSER_MAX_COUNT;i++)
{
#if !(defined _WINDOWS64)
#if !(defined _WINDOWS64 || _XBOX)
GameSettingsA[i]=(GAME_SETTINGS *)StorageManager.GetGameDefinedProfileData(i);
#else
GameSettingsA[i]=(GAME_SETTINGS *)ProfileManager.GetGameDefinedProfileData(i);
@@ -745,7 +745,7 @@ void CMinecraftApp::InitGameSettings()
SetDefaultOptions(pProfileSettings,i);
ProfileManager.LoadSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
ApplyGameSettingsChanged(i);
#else
#elif !defined(_XBOX)
C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
// 4J-PB - don't cause an options write to happen here
SetDefaultOptions(pProfileSettings,i,false);
@@ -753,7 +753,7 @@ void CMinecraftApp::InitGameSettings()
}
}
#if !(defined _WINDOWS64)
#if !(defined _WINDOWS64 || _XBOX)
int CMinecraftApp::SetDefaultOptions(C4JStorage::PROFILESETTINGS *pSettings,const int iPad,bool bWriteProfile)
#else
int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,const int iPad)
@@ -846,7 +846,7 @@ int CMinecraftApp::SetDefaultOptions(C_4JProfile::PROFILESETTINGS *pSettings,con
//#endif
#if !(defined _WINDOWS64)
#if !(defined _WINDOWS64 || _XBOX)
GameSettingsA[iPad]->bSettingsChanged=bWriteProfile;
#endif
@@ -874,7 +874,7 @@ int CMinecraftApp::DefaultOptionsCallback(LPVOID pParam,C_4JProfile::PROFILESETT
return 0;
}
#if !(defined _WINDOWS64)
#if !(defined _WINDOWS64 || _XBOX)
wstring CMinecraftApp::toStringOptionsStatus(const C4JStorage::eOptionsCallback &eStatus)
{
#ifndef _CONTENT_PACKAGE