Changeset 10392 for code/branches/core7/src/orxonox/LevelManager.cc

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)

File:

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

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)