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

Timestamp:

Nov 27, 2017, 4:38:50 PM (7 years ago)

Author:

kohlia

Message:

Pawn killing works too now

File:

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

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

@@ -45 +45 @@
 #include "worldentities/CameraPosition.h"
 #include "overlays/OverlayGroup.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -127 +126 @@
         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);
     }