Merge branch 'dev' of https://github.com/adiblol/colobot into dev

Conflicts:
	src/ui/slider.cpp

1 files changed, 12 insertions, 1 deletions

diff --git a/src/app/app.h b/src/app/app.h
index 849f441..8848be1 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -146,6 +146,17 @@ struct InputBinding
     }
 };
 
+/**
+ * \enum ParseArgsStatus
+ * \brief State of parsing commandline arguments
+ */
+enum ParseArgsStatus
+{
+    PARSE_ARGS_OK   = 1, //! < all ok
+    PARSE_ARGS_FAIL = 2, //! < invalid syntax
+    PARSE_ARGS_HELP = 3  //! < -help requested
+};
+
 struct ApplicationPrivate;
 
 /**
@@ -201,7 +212,7 @@ public:
 
 public:
     //! Parses commandline arguments
-    bool        ParseArguments(int argc, char *argv[]);
+    ParseArgsStatus ParseArguments(int argc, char *argv[]);
     //! Initializes the application
     bool        Create();
     //! Main event loop