Changeset 10392 for code/branches/core7/src/orxonox

Timestamp:

Apr 23, 2015, 10:44:57 PM (9 years ago)

Author:

landauf

Message:

Loader is now a singleton instead of a static class. fixes issue with statically initialized ClassTreeMask (which again requires a BaseObject-Identifier)

Location:

code/branches/core7/src/orxonox

Files:

• Level.cc (modified) (2 diffs)
• LevelManager.cc (modified) (2 diffs)
• gamestates/GSLevel.cc (modified) (2 diffs)

code/branches/core7/src/orxonox/Level.cc

@@ -63 +63 @@
 
             if (this->xmlfile_)
-                Loader::unload(this->xmlfile_);
+                Loader::getInstance().unload(this->xmlfile_);
         }
     }
@@ -95 +95 @@
         this->xmlfile_ = new XMLFile(mask, this->xmlfilename_);
 
-        Loader::open(this->xmlfile_);
+        Loader::getInstance().open(this->xmlfile_);
     }
 

code/branches/core7/src/orxonox/LevelManager.cc

@@ -276 +276 @@
                 // Load the LevelInfo object from the level file.
                 XMLFile file = XMLFile(*it);
-                Loader::load(&file, mask, false, true);
+                Loader::getInstance().load(&file, mask, false, true);
 
                 // Find the LevelInfo object we've just loaded (if there was one)
@@ -284 +284 @@
 
                 // We don't need the loaded stuff anymore
-                Loader::unload(&file);
+                Loader::getInstance().unload(&file);
 
                 if(info == NULL)

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

@@ -168 +168 @@
         // call the loader
         startFile_ = new XMLFile(LevelManager::getInstance().getDefaultLevel());
-        bool loaded = Loader::open(startFile_);
+        bool loaded = Loader::getInstance().open(startFile_);
 
         Core::getInstance().updateLastLevelTimestamp();
@@ -177 +177 @@
     void GSLevel::unloadLevel()
     {
-        Loader::unload(startFile_);
+        Loader::getInstance().unload(startFile_);
         delete startFile_;