Changeset 10579

Timestamp:

Sep 9, 2015, 4:14:14 PM (9 years ago)

Author:

landauf

Message:

inverted dependency between level and gametype: gametype now references level with a strong-pointer, but level references gametype with a weak-pointer. this means that gametype can be destroyed before level which in turn means that level is the last instance that is destroyed when the level is unloaded.

File:

• code/branches/core7/src/orxonox/Level.cc (modified) (1 diff)

code/branches/core7/src/orxonox/Level.cc

@@ -123 +123 @@
         Gametype* rootgametype = orxonox_cast<Gametype*>(identifier->fabricate(this));
 
-        rootgametype->setLevel(StrongPtr<Level>(NULL)); // avoid circular references
-        this->setGametype(StrongPtr<Gametype>(rootgametype));
+        // store a weak-pointer to the gametype to avoid a circular dependency between this level and the gametype (which has a strong-reference on this level)
+        this->setGametype(WeakPtr<Gametype>(rootgametype));
+
         rootgametype->init(); // call init() AFTER the gametype was set