Changeset 10578 for code/branches/core7/src/orxonox/infos

Timestamp:

Sep 9, 2015, 4:10:21 PM (9 years ago)

Author:

landauf

Message:

removed the 'bAddRef' argument from StrongPtr's constructor. it was a bad hack and shouldn't be used. in fact, it was only used to avoid recursive dependencies if one of the four base objects (Namespace, Level, Gametype, Scene) referenced itself with a StrongPtr.
instead of the 'bAddRef'-hack BaseObject now stores the references in a new construct called StrongOrWeakPtr which can either store the reference in a StrongPtr (like it did before) or in a WeakPtr (which is a cleaner alternative to 'bAddRef=true')

File:

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

code/branches/core7/src/orxonox/infos/PlayerInfo.cc

@@ -98 +98 @@
     {
         Gametype* oldGametype = this->getGametype();
-        this->setGametype(gametype);
+        this->setGametype(StrongPtr<Gametype>(gametype));
         Gametype* newGametype = this->getGametype();