This commit is contained in:
Paul 2001-07-02 16:03:27 +00:00
parent 43044a6d01
commit bb4f8b88fa
2 changed files with 19 additions and 7 deletions

View File

@ -446,13 +446,7 @@ void CFrontEndOptions::init()
} }
} }
m_bgmVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SONG); getValues();
m_sfxVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SFX);
m_speechVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SPEECH);
m_controlStyle=CPadConfig::getConfig();
m_vibrationStatus=m_lastVibrationStatus=PadGetVibrationIsTurnedOn(0);
m_screenXOff=VidGetXOfs();
m_screenYOff=VidGetYOfs();
m_saveLoadDatabase=NULL; m_saveLoadDatabase=NULL;
} }
@ -740,6 +734,7 @@ void CFrontEndOptions::think(int _frames)
int stat=m_saveLoadDatabase->getLoadStatus(); int stat=m_saveLoadDatabase->getLoadStatus();
if(stat==CSaveLoadDatabase::FINISHED_OK) if(stat==CSaveLoadDatabase::FINISHED_OK)
{ {
getValues();
setLoadMode(LOADMODE__LOADOK); setLoadMode(LOADMODE__LOADOK);
} }
else if(stat==CSaveLoadDatabase::FAILED) else if(stat==CSaveLoadDatabase::FAILED)
@ -815,6 +810,22 @@ CFrontEndScene::FrontEndMode CFrontEndOptions::getNextMode()
return CFrontEndScene::MODE__MAIN_TITLES; return CFrontEndScene::MODE__MAIN_TITLES;
} }
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CFrontEndOptions::getValues()
{
m_bgmVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SONG);
m_sfxVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SFX);
m_speechVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SPEECH);
m_controlStyle=CPadConfig::getConfig();
m_vibrationStatus=m_lastVibrationStatus=PadGetVibrationIsTurnedOn(0);
m_screenXOff=VidGetXOfs();
m_screenYOff=VidGetYOfs();
}
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
Function: Function:

View File

@ -52,6 +52,7 @@ public:
private: private:
void getValues();
void setLoadMode(int _newMode); void setLoadMode(int _newMode);