feat: settings saving
This commit is contained in:
1 parent
5a3c528ed0
commit
f615927e0e
6 files changed
+22
-12
No files matched your search
@@ -1166,13 +1166,17 @@ void SoundEngine::playMusicTick()
|
||||
void SoundEngine::playMusicUpdate()
|
||||
{
|
||||
//return;
|
||||
static bool firstCall = true;
|
||||
static float fMusicVol = 0.0f;
|
||||
#ifndef _WINDOWS64 //str1k3r - if used on windows64 volume doesnt update
|
||||
static bool firstCall = true;
|
||||
if( firstCall )
|
||||
{
|
||||
fMusicVol = getMasterMusicVolume();
|
||||
firstCall = false;
|
||||
}
|
||||
#else
|
||||
fMusicVol = getMasterMusicVolume();
|
||||
#endif
|
||||
|
||||
switch(m_StreamState)
|
||||
{
|
||||
@@ -1520,7 +1524,9 @@ void SoundEngine::playMusicUpdate()
|
||||
}
|
||||
|
||||
// volume change required?
|
||||
if(fMusicVol!=getMasterMusicVolume())
|
||||
#ifndef _WINDOWS64
|
||||
if(fMusicVol!=getMasterMusicVolume()) //str1k3r - if used on windows64 music doesnt update its volume
|
||||
#endif
|
||||
{
|
||||
fMusicVol=getMasterMusicVolume();
|
||||
HSAMPLE hSample = AIL_stream_sample_handle( m_hStream);
|
||||
|
||||
@@ -764,11 +764,11 @@ void CMinecraftApp::InitGameSettings()
|
||||
//SetDefaultGameSettings(i); - done on a callback from the profile manager
|
||||
|
||||
// 4J-PB - adding in for Windows & PS3 to set the defaults for the joypad
|
||||
#if defined _WINDOWS64// || defined __PSVITA__
|
||||
#if defined _WINDOWS64
|
||||
C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
|
||||
// clear this for now - it will come from reading the system values
|
||||
memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
|
||||
SetDefaultOptions(pProfileSettings,i);
|
||||
ProfileManager.LoadSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
|
||||
ApplyGameSettingsChanged(i);
|
||||
#elif defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__
|
||||
C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
|
||||
// 4J-PB - don't cause an options write to happen here
|
||||
@@ -2355,6 +2355,8 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, int iPa
|
||||
{
|
||||
#if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__ )
|
||||
StorageManager.WriteToProfile(i,true, bOverride5MinuteTimer);
|
||||
#elif _WINDOWS64
|
||||
ProfileManager.SaveSettings(GameSettingsA[i], sizeof(GAME_SETTINGS));
|
||||
#else
|
||||
ProfileManager.WriteToProfile(i,true, bOverride5MinuteTimer);
|
||||
#endif
|
||||
@@ -2368,6 +2370,8 @@ void CMinecraftApp::CheckGameSettingsChanged(bool bOverride5MinuteTimer, int iPa
|
||||
{
|
||||
#if ( defined __PS3__ || defined __ORBIS__ || defined _DURANGO || defined __PSVITA__)
|
||||
StorageManager.WriteToProfile(iPad,true, bOverride5MinuteTimer);
|
||||
#elif _WINDOWS64
|
||||
ProfileManager.SaveSettings(GameSettingsA[iPad], sizeof(GAME_SETTINGS));
|
||||
#else
|
||||
ProfileManager.WriteToProfile(iPad,true, bOverride5MinuteTimer);
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user