summaryrefslogtreecommitdiffstats
path: root/src/app/app.h
diff options
context:
space:
mode:
authorMichał Konopacki <konopacki.m@gmail.com>2012-08-13 23:46:47 +0200
committerMichał Konopacki <konopacki.m@gmail.com>2012-08-13 23:46:47 +0200
commite942400c8bb9b6836bdfe705111f7ec63ef19e28 (patch)
tree66d5aea574f5a4530492b6ab69956003427df98b /src/app/app.h
parent9ee1d2e172162be25b113595ad16779aa0a49a87 (diff)
parent8b2bca72dd71a1c23db51269a147443c80758f10 (diff)
downloadcolobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.tar.gz
colobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.tar.bz2
colobot-e942400c8bb9b6836bdfe705111f7ec63ef19e28.zip
Merge remote-tracking branch 'upstream/dev-ui' into dev-ui
Diffstat (limited to 'src/app/app.h')
-rw-r--r--src/app/app.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/app/app.h b/src/app/app.h
index 0cfaad2..7991177 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -131,6 +131,9 @@ public:
//! Returns the code to be returned at main() exit
int GetExitCode();
+ //! Returns the message of error (set to something if exit code is not 0)
+ const std::string& GetErrorMessage();
+
//! Cleans up before exit
void Destroy();
@@ -234,6 +237,9 @@ protected:
//! Whether debug mode is enabled
bool m_debugMode;
+ //! Message to be displayed as error to the user
+ std::string m_errorMessage;
+
//! Current configuration of OpenGL display device
Gfx::GLDeviceConfig m_deviceConfig;
//! Previous configuration of OpenGL display device