Changeset 2010 for code/branches/objecthierarchy/src/orxonox/gamestates

Timestamp:

Oct 25, 2008, 5:13:35 PM (16 years ago)

Author:

landauf

Message:

renamed Level to XMLFile

Location:

code/branches/objecthierarchy/src/orxonox/gamestates

Files:

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

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

@@ -35 +35 @@
 #include "core/CommandLine.h"
 #include "core/Loader.h"
+#include "core/XMLFile.h"
 #include "core/Core.h"
 #include "network/Server.h"
@@ -48 +49 @@
         , server_(0)
         , sceneManager_(0)
-        , startLevel_(0)
+        , startFile_(0)
     {
     }
@@ -74 +75 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
-        Loader::open(startLevel_);
+        startFile_ = new XMLFile(Settings::getDataPath() + "levels/sample.oxw");
+        Loader::open(startFile_);
 
         server_->open();
@@ -89 +90 @@
         // TODO: Remove and destroy console command
 
-        Loader::unload(startLevel_);
-        delete this->startLevel_;
+        Loader::unload(startFile_);
+        delete this->startFile_;
 
         this->server_->close();

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

@@ -56 +56 @@
         network::Server*      server_;
         Ogre::SceneManager*   sceneManager_;
-        Level*                startLevel_;       //!< current hard coded default level
+        XMLFile*              startFile_;        //!< current hard coded default level
     };
 }

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

@@ -36 +36 @@
 #include "core/input/KeyBinder.h"
 #include "core/Loader.h"
+#include "core/XMLFile.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
@@ -56 +57 @@
         , inputState_(0)
         , radar_(0)
-        , startLevel_(0)
+        , startFile_(0)
     {
         RegisterObject(GSLevel);
@@ -154 +155 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample2.oxw");
-        Loader::open(startLevel_);
+        startFile_ = new XMLFile(Settings::getDataPath() + "levels/sample2.oxw");
+        Loader::open(startFile_);
     }
 
     void GSLevel::unloadLevel()
     {
-        Loader::unload(startLevel_);
-        delete this->startLevel_;
+        Loader::unload(startFile_);
+        delete this->startFile_;
     }
 

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

@@ -68 +68 @@
         SimpleInputState*     inputState_;
         Radar*                radar_;            //!< represents the Radar (not the HUD part)
-        Level*                startLevel_;       //!< current hard coded default level
+        XMLFile*              startFile_;        //!< current hard coded default level
 
         // config values