Changeset 10569

Timestamp:

Sep 8, 2015, 10:18:05 PM (9 years ago)

Author:

landauf

Message:

fixed bug which was introduced in r10563: when unloading in client mode, the Level object was not destroyed because it was still referenced by MeshLodInformation instances (which are not Synchronizables). Now the level is unloaded correctly even in client mode.

File:

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

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

@@ -47 +47 @@
 
 #include "LevelManager.h"
+#include "Level.h"
 #include "PlayerManager.h"
 #include "GSRoot.h"
@@ -214 +215 @@
     void GSLevel::unloadLevelAsClient()
     {
-        ObjectList<Synchronisable>::iterator it;
-        for(it = ObjectList<Synchronisable>::begin(); it; )
-        {
-            if( it->getSyncMode() != 0x0 )
+        for (ObjectList<Level>::iterator it = ObjectList<Level>::begin(); it != ObjectList<Level>::end(); )
+        {
+            StrongPtr<Level> level = *(it++); // StrongPtr prevents that the Level gets destroyed while we loop over it
+            for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(level); it != ObjectList<BaseObject>::end(level); )
+                (it++)->destroy();
+        }
+
+        for (ObjectList<Synchronisable>::iterator it = ObjectList<Synchronisable>::begin(); it != ObjectList<Synchronisable>::end(); )
+        {
+            if (it->getSyncMode() != 0x0)
                 (it++)->destroy();
             else
-            {
                 ++it;
-            }
         }
     }