mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-17 21:51:17 +02:00
Code Issues Projects Releases Wiki Activity

Attempt for bugfix to resume from msgbox

Browse Source
This commit is contained in:
Mark Vejvoda
2010-03-17 18:04:44 +00:00
parent eddd0cd19b
commit ae632f4d7a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,7 +256,7 @@ void Program::exit() {
// ==================== PRIVATE ==================== // ==================== PRIVATE ====================
void Program::init(WindowGl *window){ void Program::init(WindowGl *window, bool initSound){
this->window= window; this->window= window;
Config &config= Config::getInstance(); Config &config= Config::getInstance();
@@ -299,8 +299,10 @@ void Program::init(WindowGl *window){
renderer.init(); renderer.init();
//sound //sound
SoundRenderer &soundRenderer= SoundRenderer::getInstance(); if(initSound == true) {
soundRenderer.init(window); SoundRenderer &soundRenderer= SoundRenderer::getInstance();
soundRenderer.init(window);
}
NetworkInterface::setAllowGameDataSynchCheck(Config::getInstance().getBool("AllowGameDataSynchCheck","0")); NetworkInterface::setAllowGameDataSynchCheck(Config::getInstance().getBool("AllowGameDataSynchCheck","0"));
NetworkInterface::setAllowDownloadDataSynch(Config::getInstance().getBool("AllowDownloadDataSynch","0")); NetworkInterface::setAllowDownloadDataSynch(Config::getInstance().getBool("AllowDownloadDataSynch","0"));
@@ -378,7 +380,7 @@ void Program::showMessage(const char *msg) {
#endif #endif
//MainWindow *mainWindow= new MainWindow(this); //MainWindow *mainWindow= new MainWindow(this);
init(this->window); init(this->window,false);
setState(originalState); setState(originalState);
//this->programState = originalState; //this->programState = originalState;

2
source/glest_game/main/program.h
View File

@@ -127,7 +127,7 @@ public:
void exit(); void exit();
private: private:
void init(WindowGl *window); void init(WindowGl *window, bool initSound=true);
void setDisplaySettings(); void setDisplaySettings();
void restoreDisplaySettings(); void restoreDisplaySettings();
}; };