Changeset 10578 for code/branches/core7/src/libraries/core/BaseObject.cc

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/libraries/core/BaseObject.cc (modified) (1 diff)

code/branches/core7/src/libraries/core/BaseObject.cc

@@ -77 +77 @@
         {
             this->setFile(this->creator_->getFile());
-            this->setNamespace(this->creator_->namespace_);
-            this->setScene(this->creator_->scene_, this->creator_->sceneID_);
-            this->setGametype(this->creator_->gametype_);
-            this->setLevel(this->creator_->level_);
+
+            // store strong-pointers on all four base objects by default (can be overwritten with weak-ptr after the constructor if necessary)
+            this->setNamespace(this->creator_->namespace_.createStrongPtr());
+            this->setScene    (this->creator_->scene_    .createStrongPtr(), this->creator_->sceneID_);
+            this->setGametype (this->creator_->gametype_ .createStrongPtr());
+            this->setLevel    (this->creator_->level_    .createStrongPtr());
         }
         else