Changeset 3245 for code/branches/core4/src/orxonox/gamestates

Timestamp:

Jun 29, 2009, 1:32:40 PM (16 years ago)

Author:

rgrieder

Message:

Moved Game::getLevel to LevelManager::getStartLevel and Game::setLevel to LevelManager::setStartLevel.

Location:

code/branches/core4/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (4 diffs)
• GSLevel.h (modified) (1 diff)
• GSMainMenu.cc (modified) (1 diff)
• GSRoot.cc (modified) (3 diffs)
• GSRoot.h (modified) (1 diff)

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

@@ -71 +71 @@
         , radar_(0)
         , cameraManager_(0)
-        , levelManager_(0)
     {
         RegisterObject(GSLevel);
@@ -120 +119 @@
         if (GameMode::isMaster())
         {
-            // create the global LevelManager
-            this->levelManager_ = new LevelManager();
-
             this->loadLevel();
         }
@@ -202 +198 @@
         }
 
-        if (this->levelManager_)
-        {
-            delete this->levelManager_;
-            this->levelManager_ = 0;
-        }
-
         if (this->playerManager_)
         {
@@ -255 +245 @@
         CommandLine::getValue("level", &levelName);
         if (levelName == "")
-            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + Game::getInstance().getLevel());
+            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getStartLevel());
         else
             startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);

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

@@ -68 +68 @@
         Radar*                radar_;                   //!< represents the Radar (not the HUD part)
         CameraManager*        cameraManager_;           //!< camera manager for this level
-        LevelManager*         levelManager_;            //!< global level manager
         PlayerManager*        playerManager_;           //!< player manager for this level
         QuestManager*         questManager_;

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

@@ -67 +67 @@
 
         // show main menu
-        GUIManager::getInstance().showGUI("mainmenu_2");
+        GUIManager::getInstance().showGUI("mainmenu_3");
         GUIManager::getInstance().setCamera(this->camera_);
         GraphicsManager::getInstance().setCamera(this->camera_);

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

@@ -37 +37 @@
 #include "interfaces/TimeFactorListener.h"
 #include "interfaces/Tickable.h"
+#include "LevelManager.h"
 
 namespace orxonox
@@ -83 +84 @@
         }
 
+        // create the global LevelManager
+        this->levelManager_ = new LevelManager();
+
         // Load level directly?
         bool loadLevel = false;
@@ -129 +133 @@
         }
 */
+
+        delete this->levelManager_;
     }
 

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

@@ -52 +52 @@
 
     private:
-        float                 timeFactor_;       //!< A factor that sets the gamespeed. 1 is normal.
+        float                 timeFactor_;              //!< A factor that sets the gamespeed. 1 is normal.
         bool                  bPaused_;
         float                 timeFactorPauseBackup_;
+
+        LevelManager*         levelManager_;            //!< global level manager
 
         // console commands