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

- disable in game screen res change for osx (prompt user to restart game)

Browse Source
This commit is contained in:
SoftCoder
2014-12-06 18:45:26 -08:00
parent 3e3fef88f5
commit 8cd7a9580f
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/glest_game

Submodule data/glest_game updated: c73c69e196...f674bb7461

11
source/glest_game/menu/menu_state_options_graphics.cpp
View File

@@ -591,6 +591,14 @@ void MenuStateOptionsGraphics::mouseClick(int x, int y, MouseButton mouseButton)
if(selectedMode == NULL) { if(selectedMode == NULL) {
throw megaglest_runtime_error("selectedMode == NULL"); throw megaglest_runtime_error("selectedMode == NULL");
} }
#if defined(__APPLE__)
mainMessageBoxState=1;
mainMessageBox.init(lang.getString("Ok"),lang.getString("Cancel"));
screenModeChangedTimer= time(NULL);
showMessageBox(lang.getString("RestartNeeded"), lang.getString("ResolutionChanged"), false);
#else
WindowGl *window = this->program->getWindow(); WindowGl *window = this->program->getWindow();
window->ChangeVideoMode(true, window->ChangeVideoMode(true,
selectedMode->width, selectedMode->width,
@@ -609,8 +617,9 @@ void MenuStateOptionsGraphics::mouseClick(int x, int y, MouseButton mouseButton)
mainMessageBoxState=1; mainMessageBoxState=1;
mainMessageBox.init(lang.getString("Ok"),lang.getString("Cancel")); mainMessageBox.init(lang.getString("Ok"),lang.getString("Cancel"));
screenModeChangedTimer= time(NULL); screenModeChangedTimer= time(NULL);
//showMessageBox(lang.getString("RestartNeeded"), lang.getString("ResolutionChanged"), false);
showMessageBox(lang.getString("ResolutionChanged"), lang.getString("Notice"), false); showMessageBox(lang.getString("ResolutionChanged"), lang.getString("Notice"), false);
#endif
//No saveConfig() here! this is done by the messageBox //No saveConfig() here! this is done by the messageBox
return; return;
} }