Changeset 1646 for code/branches/gui/src/core/Loader.cc

Timestamp:

Jul 24, 2008, 10:40:22 PM (16 years ago)

Author:

rgrieder

Message:

• privatised InputState c'tors
• added destruction code for GUIManager
• fixed some issues and bugs
• found 2400 memory leaks
• haven't done anything about it
• converted GUIManager to Ogre Singleton
• added NULL checkers in Loader

File:

• code/branches/gui/src/core/Loader.cc (modified) (4 diffs)

code/branches/gui/src/core/Loader.cc

@@ -64 +64 @@
     void Loader::add(const Level* level, const ClassTreeMask& mask)
     {
+        if (!level)
+            return;
         Loader::levels_s.insert(Loader::levels_s.end(), std::pair<const Level*, ClassTreeMask>(level, mask));
     }
@@ -69 +71 @@
     void Loader::remove(const Level* level)
     {
+        if (!level)
+            return;
         for (std::vector<std::pair<const Level*, ClassTreeMask> >::iterator it = Loader::levels_s.begin(); it != Loader::levels_s.end(); ++it)
         {
@@ -108 +112 @@
     bool Loader::load(const Level* level, const ClassTreeMask& mask)
     {
+        if (!level)
+            return false;
+
         Loader::currentMask_s = level->getMask() * mask;
 
@@ -165 +172 @@
     void Loader::unload(const Level* level, const ClassTreeMask& mask)
     {
+        if (!level)
+            return;
         for (Iterator<BaseObject> it = ObjectList<BaseObject>::begin(); it; )
         {