qloak/cafeberry
1
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

fix: PS-Vita and Xbox 360 compile errors

Browse Source
This commit is contained in:
pieeebot
2026-09-08 16:33:35 +01:00
parent 886c0c8e29
commit 8970406c7f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/Audio/SoundEngine.cpp
+2 -2
View File
@@ -1119,12 +1119,12 @@ int SoundEngine::OpenStreamThreadProc( void* lpParameter )
// playMusicTick
//
/////////////////////////////////////////////
#ifndef __PSVITA__ // AP - vita will update the music during the mixer callback
void SoundEngine::playMusicTick()
{
#ifndef __PSVITA__ // AP - vita will update the music during the mixer callback
playMusicUpdate();
}
#endif
}
// AP - moved to a separate function so it can be called from the mixer callback on Vita
void SoundEngine::playMusicUpdate()
Minecraft.Client/Common/Audio/SoundEngine.h
-2
View File
@@ -98,9 +98,7 @@ public:
virtual void play(int iSound, float x, float y, float z, float volume, float pitch);
virtual void playStreaming(const wstring& name, float x, float y , float z, float volume, float pitch, bool bMusicDelay=true);
virtual void playUI(int iSound, float volume, float pitch);
#ifndef __PSVITA__
virtual void playMusicTick();
#endif
virtual void updateMusicVolume(float fVal);
virtual void updateSystemMusicPlaying(bool isPlaying);
virtual void updateSoundEffectVolume(float fVal);
Minecraft.Client/Common/Consoles_App.cpp
+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
Minecraft.Client/PSVita/PSVita_Minecraft.cpp
+2
View File
@@ -717,6 +717,8 @@ int main()
}
}
pMinecraft->soundEngine->playMusicTick();
ui.tick();
ui.render();