Changeset 10562 for code/branches/core7/src/orxonox

Timestamp:

Aug 29, 2015, 11:15:28 PM (9 years ago)

Author:

landauf

Message:

removed unnecessary code - this is all done by passing the context to the BaseObject's constructor

Location:

code/branches/core7/src/orxonox

Files:

• Level.cc (modified) (1 diff)
• Scene.cc (modified) (2 diffs)

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

@@ -134 +134 @@
     {
         this->objects_.push_back(object);
-        object->setGametype(this->getGametype());
         object->setLevel(this);
     }

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

@@ -62 +62 @@
         RegisterObject(Scene);
 
-        this->setScene(StrongPtr<Scene>(this, false), OBJECTID_UNKNOWN);
+        this->setScene(StrongPtr<Scene>(this, false), this->getObjectID());
         this->bShadows_ = true;
         this->bDebugDrawPhysics_ = false;
@@ -316 +316 @@
     {
         this->objects_.push_back(object);
-        object->setScene(this, this->getObjectID());
     }