From 1df365d69737713532b15d935a4fdef6939b9ef4 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Tue, 3 Apr 2012 00:32:52 +0000 Subject: [PATCH] I removed the automatic game pausing when message are shown because I don't like it ( sc does not like it at all so ... ). Still auto-pausing while showing menues ingame in singleplayer. --- source/glest_game/game/game.cpp | 6 +++--- source/glest_game/gui/gui.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp index e14c204e5..bda086645 100644 --- a/source/glest_game/game/game.cpp +++ b/source/glest_game/game/game.cpp @@ -3448,9 +3448,9 @@ bool Game::getPaused() if(popupMenu.getVisible() == true || popupMenuSwitchTeams.getVisible() == true){ return true; } - if(mainMessageBox.getEnabled() == true || errorMessageBox.getEnabled() == true){ - return true; - } +// if(mainMessageBox.getEnabled() == true || errorMessageBox.getEnabled() == true){ +// return true; +// } if(currentUIState != NULL) { return true; } diff --git a/source/glest_game/gui/gui.h b/source/glest_game/gui/gui.h index fa43506cc..3a1b4d32c 100644 --- a/source/glest_game/gui/gui.h +++ b/source/glest_game/gui/gui.h @@ -162,7 +162,6 @@ public: Texture2D *getHudTexture() const {return hudTexture;} void setHudTexture(Texture2D* value) { hudTexture = value;} - const CommandType *getActiveCommandType() const {return activeCommandType;} const Mouse3d *getMouse3d() const {return &mouse3d;} const Display *getDisplay() const {return &display;} const Selection *getSelection() const {return &selection;}