mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-04 03:11:53 +02:00
Code Issues Projects Releases Wiki Activity

- added error checking and allow the game to continue if we cannot init the sound system

Browse Source 
- persist error messagebox between program states
This commit is contained in:
Mark Vejvoda
2010-07-09 22:16:26 +00:00
parent eb34eb1fe5
commit f40dd94b1d
10 changed files with 358 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/glest_game/main/program.cpp
View File

@@ -321,6 +321,8 @@ void Program::setState(ProgramState *programState, bool cleanupOldState)
try {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
bool msgBoxEnabled = msgBox.getEnabled();
if(dynamic_cast<Game *>(programState) != NULL) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
@@ -351,7 +353,7 @@ void Program::setState(ProgramState *programState, bool cleanupOldState)
//mesage box
Lang &lang= Lang::getInstance();
msgBox.init(lang.get("Ok"));
msgBox.setEnabled(false);
msgBox.setEnabled(msgBoxEnabled);
this->programState= programState;
programState->load();
@@ -372,6 +374,10 @@ void Program::setState(ProgramState *programState, bool cleanupOldState)
}
sleep(0);
if(dynamic_cast<Intro *>(programState) != NULL && msgBoxEnabled == true) {
showCursor(true);
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}
catch(const exception &e){
@@ -470,7 +476,18 @@ void Program::init(WindowGl *window, bool initSound, bool toggleFullScreen){
//sound
if(initSound == true && toggleFullScreen == false) {
SoundRenderer &soundRenderer= SoundRenderer::getInstance();
soundRenderer.init(window);
bool initOk = soundRenderer.init(window);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] initOk = %d\n",__FILE__,__FUNCTION__,__LINE__,initOk);
// Test sound system failed
//initOk = false;
// END
if(initOk == false) {
string sError = "Sound System could not be initialzed!";
this->showMessage(sError.c_str());
}
// Run sound streaming in a background thread if enabled
if(config.getBool("ThreadedSoundStream","false") == true) {