Changeset 5843 for code/branches/core5/src/orxonox/Main.cc

Timestamp:

Sep 30, 2009, 8:42:45 PM (15 years ago)

Author:

rgrieder

Message:

Added comma operator in the GameState hierarchy parser: Use "standalone,client,server" and the whole underlaying tree will be used for all three states. See Main.cc

File:

• code/branches/core5/src/orxonox/Main.cc (modified) (3 diffs)

code/branches/core5/src/orxonox/Main.cc

@@ -31 +31 @@
 @file
 @brief
-    The main function of Orxonox.
+    The main function of Orxonox (but not the entry point of the program!)
 */
 
 #include "OrxonoxPrereqs.h"
-#include "SpecialConfig.h"
 
-#include "util/Exception.h"
 #include "core/CommandLine.h"
 #include "core/Game.h"
@@ -57 +55 @@
     /**
     @brief
-        Main method. Game starts here (except for static initialisations).
+        Starting point of orxonox (however not the entry point of the program!)
     */
     int main(const std::string& strCmdLine)
@@ -67 +65 @@
         " graphics"
         "  mainMenu"
-        "  standalone"
-        "   level"
-        "  server"
-        "   level"
-        "  client"
+        "  standalone,server,client"
         "   level"
         " dedicated"