Changeset 10571 for code/branches/core7/src/libraries/core

Timestamp:

Sep 9, 2015, 1:11:13 PM (9 years ago)

Author:

landauf

Message:

BaseObject returns plain pointers instead of StrongPtrs for Namespace, Level, Scene, and Gametype.

Location:

code/branches/core7/src/libraries/core

Files:

• BaseObject.cc (modified) (1 diff)
• BaseObject.h (modified) (3 diffs)

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

@@ -78 +78 @@
         {
             this->setFile(this->creator_->getFile());
-            this->setNamespace(this->creator_->getNamespace());
-            this->setScene(this->creator_->getScene(), this->creator_->getSceneID());
-            this->setGametype(this->creator_->getGametype());
-            this->setLevel(this->creator_->getLevel());
+            this->setNamespace(this->creator_->namespace_);
+            this->setScene(this->creator_->scene_, this->creator_->sceneID_);
+            this->setGametype(this->creator_->gametype_);
+            this->setLevel(this->creator_->level_);
         }
         else

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

@@ -139 +139 @@
 
             inline void setNamespace(const StrongPtr<Namespace>& ns) { this->namespace_ = ns; }
-            inline const StrongPtr<Namespace>& getNamespace() const { return this->namespace_; }
+            inline Namespace* getNamespace() const { return this->namespace_; }
 
             inline void setCreator(BaseObject* creator) { this->creator_ = creator; }
@@ -145 +145 @@
 
             inline void setScene(const StrongPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
-            inline const StrongPtr<Scene>& getScene() const { return this->scene_; }
+            inline Scene* getScene() const { return this->scene_; }
             inline virtual uint32_t getSceneID() const { return this->sceneID_; }
 
@@ -157 +157 @@
                 }
             }
-            inline const StrongPtr<Gametype>& getGametype() const { return this->gametype_; }
+            inline Gametype* getGametype() const { return this->gametype_; }
             inline Gametype* getOldGametype() const { return this->oldGametype_; }
             virtual void changedGametype() {}
 
             inline void setLevel(const StrongPtr<Level>& level) { this->level_ = level; }
-            inline const StrongPtr<Level>& getLevel() const { return this->level_; }
+            inline Level* getLevel() const { return this->level_; }
 
             void addEventSource(BaseObject* source, const std::string& state);