Changeset 5839 for code/branches/core5/src/libraries/core

Timestamp:

Sep 30, 2009, 12:42:28 PM (16 years ago)

Author:

scheusso

Message:

Fixed problem with scene and creators
creatorID is now always the objectID of the scene except for the case

• if the object is the scene (then the creatorID is OBJECTID_UNKNOWN)
• if the object is "above" the scene (e.g. level), then the cID is also OBJECTID_UNKNOWN

Location:

code/branches/core5/src/libraries/core

Files:

• BaseObject.cc (modified) (3 diffs)
• BaseObject.h (modified) (2 diffs)

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

@@ -46 +46 @@
 #include "XMLNameListener.h"
 #include "XMLPort.h"
+#include "network/NetworkPrereqs.h"
 
 namespace orxonox
@@ -74 +75 @@
             this->setFile(this->creator_->getFile());
             this->setNamespace(this->creator_->getNamespace());
-            this->setScene(this->creator_->getScene());
+            this->setScene(this->creator_->getScene(), this->creator_->getSceneID());
             this->setGametype(this->creator_->getGametype());
         }
@@ -82 +83 @@
             this->namespace_ = 0;
             this->scene_ = 0;
+            this->sceneID_ = OBJECTID_UNKNOWN;
             this->gametype_ = 0;
         }

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

@@ -135 +135 @@
             inline BaseObject* getCreator() const { return this->creator_; }
 
-            inline void setScene(const SmartPtr<Scene>& scene) { this->scene_ = scene; }
+            inline void setScene(const SmartPtr<Scene>& scene, uint32_t sceneID) { this->scene_ = scene; this->sceneID_=sceneID; }
             inline const SmartPtr<Scene>& getScene() const { return this->scene_; }
+            inline virtual uint32_t getSceneID() const { return this->sceneID_; }
 
             inline void setGametype(const SmartPtr<Gametype>& gametype)
@@ -202 +203 @@
             std::list<BaseObject*> events_;
             std::map<std::string, EventContainer*> eventContainers_;
+            uint32_t               sceneID_;
     };