Changeset 9667 for code/trunk/src/libraries/core/BaseObject.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/BaseObject.cc (modified) (4 diffs)

code/trunk/src/libraries/core/BaseObject.cc

@@ -39 +39 @@
 #include "Event.h"
 #include "EventIncludes.h"
-#include "Iterator.h"
 #include "Template.h"
 #include "XMLFile.h"
@@ -45 +44 @@
 #include "XMLPort.h"
 #include "command/Functor.h"
+#include "object/Iterator.h"
+
+#include "class/OrxonoxInterface.h" // we include this only to include OrxonoxInterface.h at least once in core to keep MSVC happy...
 
 namespace orxonox
 {
-    CreateFactory(BaseObject);
+    RegisterClass(BaseObject);
 
     /**
         @brief Constructor: Registers the object in the BaseObject-list.
     */
-    BaseObject::BaseObject(BaseObject* creator) : bInitialized_(false)
-    {
-        RegisterRootObject(BaseObject);
+    BaseObject::BaseObject(Context* context) : bInitialized_(false)
+    {
+        RegisterObject(BaseObject);
 
         this->bInitialized_ = true;
@@ -68 +70 @@
         this->mainStateFunctor_ = 0;
 
+        if (context)
+            this->setContext(context);
+
+        BaseObject* creator = orxonox_cast<BaseObject*>(context);
         this->setCreator(creator);
         if (this->creator_)
@@ -199 +205 @@
         {
             this->networkTemplateNames_.insert(temp->getLink());
-            
+
             Template* link;
             assert(!(link = Template::getTemplate(temp->getLink())) || !link->isLink());