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

Timestamp:

Apr 23, 2015, 10:44:57 PM (10 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)

File:

• code/branches/core7/src/orxonox/gamestates/GSLevel.cc (modified) (2 diffs)

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_;