Changeset 3243 for code/branches/core4/src/orxonox

Timestamp:

Jun 28, 2009, 6:22:40 PM (16 years ago)

Author:

rgrieder

Message:

Moved GameState construction from pre-main() to after Core creation. That makes it possible to use Core features (like configValues) in the GameState constructor.

Location:

code/branches/core4/src/orxonox

Files:

• Main.cc (modified) (1 diff)
• gamestates/GSClient.cc (modified) (1 diff)
• gamestates/GSClient.h (modified) (1 diff)
• gamestates/GSDedicated.cc (modified) (1 diff)
• gamestates/GSDedicated.h (modified) (1 diff)
• gamestates/GSGraphics.cc (modified) (1 diff)
• gamestates/GSGraphics.h (modified) (1 diff)
• gamestates/GSIOConsole.cc (modified) (1 diff)
• gamestates/GSIOConsole.h (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (2 diffs)
• gamestates/GSLevel.h (modified) (1 diff)
• gamestates/GSMainMenu.cc (modified) (1 diff)
• gamestates/GSMainMenu.h (modified) (1 diff)
• gamestates/GSRoot.cc (modified) (2 diffs)
• gamestates/GSRoot.h (modified) (1 diff)
• gamestates/GSServer.cc (modified) (1 diff)
• gamestates/GSServer.h (modified) (1 diff)
• gamestates/GSStandalone.cc (modified) (1 diff)
• gamestates/GSStandalone.h (modified) (1 diff)

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

@@ -70 +70 @@
         orxonox.requestState("root");
         orxonox.run();
-
-        // destroy the GameStates created pre-mainly
-        orxonox::Game::destroyStates();
-    } // orxonox gets destroyed right here!
+    }
 
     // Clean up class hierarchy stuff (identifiers, xmlport, configvalue, consolecommand)

code/branches/core4/src/orxonox/gamestates/GSClient.cc

@@ -38 +38 @@
 namespace orxonox
 {
-    AddGameState(GSClient, "client");
+    DeclareGameState(GSClient, "client", false, true);
 
     SetCommandLineArgument(ip, "127.0.0.1").information("#.#.#.#");
 
-    GSClient::GSClient(const std::string& name)
-        : GameState(name)
+    GSClient::GSClient(const GameStateConstrParams& params)
+        : GameState(params)
         , client_(0)
     {

code/branches/core4/src/orxonox/gamestates/GSClient.h

@@ -40 +40 @@
     {
     public:
-        GSClient(const std::string& name);
+        GSClient(const GameStateConstrParams& params);
         ~GSClient();
 

code/branches/core4/src/orxonox/gamestates/GSDedicated.cc

@@ -51 +51 @@
     const unsigned int MAX_COMMAND_LENGTH = 255;
     
-    AddGameState(GSDedicated, "dedicated");
+    DeclareGameState(GSDedicated, "dedicated", false, false);
     
     termios* GSDedicated::originalTerminalSettings_;
 
-    GSDedicated::GSDedicated(const std::string& name)
-        : GameState(name)
+    GSDedicated::GSDedicated(const GameStateConstrParams& params)
+        : GameState(params)
         , server_(0)
         , timeSinceLastUpdate_(0)

code/branches/core4/src/orxonox/gamestates/GSDedicated.h

@@ -48 +48 @@
     {
     public:
-        GSDedicated(const std::string& name);
+        GSDedicated(const GameStateConstrParams& params);
         ~GSDedicated();
 

code/branches/core4/src/orxonox/gamestates/GSGraphics.cc

@@ -57 +57 @@
 namespace orxonox
 {
-    AddGameState(GSGraphics, "graphics", true);
-
-    GSGraphics::GSGraphics(const std::string& name, bool countTickTime)
-        : GameState(name, countTickTime)
+    DeclareGameState(GSGraphics, "graphics", true, true);
+
+    GSGraphics::GSGraphics(const GameStateConstrParams& params)
+        : GameState(params)
         , inputManager_(0)
         , console_(0)

code/branches/core4/src/orxonox/gamestates/GSGraphics.h

@@ -52 +52 @@
     {
     public:
-        GSGraphics(const std::string& name, bool countTickTime);
+        GSGraphics(const GameStateConstrParams& params);
         ~GSGraphics();
         void setConfigValues();

code/branches/core4/src/orxonox/gamestates/GSIOConsole.cc

@@ -36 +36 @@
 namespace orxonox
 {
-    AddGameState(GSIOConsole, "ioConsole");
+    DeclareGameState(GSIOConsole, "ioConsole", false, false);
 
-    GSIOConsole::GSIOConsole(const std::string& name)
-        : GameState(name)
+    GSIOConsole::GSIOConsole(const GameStateConstrParams& params)
+        : GameState(params)
     {
     }

code/branches/core4/src/orxonox/gamestates/GSIOConsole.h

@@ -38 +38 @@
     {
     public:
-        GSIOConsole(const std::string& name);
+        GSIOConsole(const GameStateConstrParams& params);
         ~GSIOConsole();
 

code/branches/core4/src/orxonox/gamestates/GSLevel.cc

@@ -56 +56 @@
 namespace orxonox
 {
-    AddGameState(GSLevel, "level");
+    DeclareGameState(GSLevel, "level", false, true);
 
     SetCommandLineArgument(level, "").shortcut("l");
@@ -63 +63 @@
     XMLFile* GSLevel::startFile_s = NULL;
 
-    GSLevel::GSLevel(const std::string& name)
-        : GameState(name)
+    GSLevel::GSLevel(const GameStateConstrParams& params)
+        : GameState(params)
         , keyBinder_(0)
         , gameInputState_(0)

code/branches/core4/src/orxonox/gamestates/GSLevel.h

@@ -41 +41 @@
     {
     public:
-        GSLevel(const std::string& name);
+        GSLevel(const GameStateConstrParams& params);
         ~GSLevel();
         void setConfigValues();

code/branches/core4/src/orxonox/gamestates/GSMainMenu.cc

@@ -43 +43 @@
 namespace orxonox
 {
-    AddGameState(GSMainMenu, "mainMenu");
+    DeclareGameState(GSMainMenu, "mainMenu", false, true);
 
-    GSMainMenu::GSMainMenu(const std::string& name)
-        : GameState(name)
+    GSMainMenu::GSMainMenu(const GameStateConstrParams& params)
+        : GameState(params)
         , inputState_(0)
     {

code/branches/core4/src/orxonox/gamestates/GSMainMenu.h

@@ -40 +40 @@
     {
     public:
-        GSMainMenu(const std::string& name);
+        GSMainMenu(const GameStateConstrParams& params);
         ~GSMainMenu();
 

code/branches/core4/src/orxonox/gamestates/GSRoot.cc

@@ -40 +40 @@
 namespace orxonox
 {
-    AddGameState(GSRoot, "root", true);
+    DeclareGameState(GSRoot, "root", true, false);
     SetCommandLineSwitch(console);
     // Shortcuts for easy direct loading
@@ -48 +48 @@
     SetCommandLineSwitch(standalone);
 
-    GSRoot::GSRoot(const std::string& name, bool countTickTime)
-        : GameState(name, countTickTime)
+    GSRoot::GSRoot(const GameStateConstrParams& params)
+        : GameState(params)
         , timeFactor_(1.0f)
         , bPaused_(false)

code/branches/core4/src/orxonox/gamestates/GSRoot.h

@@ -38 +38 @@
     {
     public:
-        GSRoot(const std::string& name, bool countTickTime);
+        GSRoot(const GameStateConstrParams& params);
         ~GSRoot();
 

code/branches/core4/src/orxonox/gamestates/GSServer.cc

@@ -37 +37 @@
 namespace orxonox
 {
-    AddGameState(GSServer, "server");
+    DeclareGameState(GSServer, "server", false, true);
 
     SetCommandLineArgument(port, 55556).shortcut("p").information("0-65535");
 
-    GSServer::GSServer(const std::string& name)
-        : GameState(name)
+    GSServer::GSServer(const GameStateConstrParams& params)
+        : GameState(params)
         , server_(0)
     {

code/branches/core4/src/orxonox/gamestates/GSServer.h

@@ -40 +40 @@
     {
     public:
-        GSServer(const std::string& name);
+        GSServer(const GameStateConstrParams& params);
         ~GSServer();
 

code/branches/core4/src/orxonox/gamestates/GSStandalone.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    AddGameState(GSStandalone, "standalone");
+    DeclareGameState(GSStandalone, "standalone", false, true);
 
-    GSStandalone::GSStandalone(const std::string& name)
-        : GameState(name)
+    GSStandalone::GSStandalone(const GameStateConstrParams& params)
+        : GameState(params)
     {
     }

code/branches/core4/src/orxonox/gamestates/GSStandalone.h

@@ -38 +38 @@
     {
     public:
-        GSStandalone(const std::string& name);
+        GSStandalone(const GameStateConstrParams& params);
         ~GSStandalone();