Changeset 11583 for code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.cc

Timestamp:

Nov 20, 2017, 4:48:03 PM (6 years ago)

Author:

kohlia

Message:

Near object, near point and at area work!

File:

• code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.cc (modified) (4 diffs)

code/branches/ScriptableController_HS17/src/orxonox/worldentities/ControllableEntity.cc

@@ -39 +39 @@
 
 #include "Scene.h"
+#include "Level.h"
 #include "infos/PlayerInfo.h"
 #include "controllers/NewHumanController.h"
@@ -68 +69 @@
         this->camera_ = nullptr;
         this->xmlcontroller_ = nullptr;
-        //this->controller_ = nullptr;
         this->reverseCamera_ = nullptr;
         this->bDestroyWhenPlayerLeft_ = false;
@@ -127 +127 @@
         XMLPortObject(ControllableEntity, CameraPosition, "camerapositions", addCameraPosition, getCameraPosition, xmlelement, mode);
         XMLPortObject(ControllableEntity, Controller,     "controller",      setXMLController,  getXMLController,  xmlelement, mode);
+
+        if(!this->id_.empty() && this->getLevel() != nullptr)
+            this->getLevel()->getScriptableController()->registerControllableEntity(this->id_, this);
     }
 
@@ -338 +341 @@
     }
 
-    void ControllableEntity::registerToScriptableController(ScriptableController *controller)
-    {
-        controller->registerControllableEntity(this->id_, this);
-    }
-
     void ControllableEntity::setPlayer(PlayerInfo* player)
     {