Changeset 10392 for code/branches/core7/src/orxonox/Level.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/Level.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_);
     }