Changeset 11690 for code/branches/Presentation_HS17/src/orxonox/worldentities/ControllableEntity.cc

Timestamp:

Dec 18, 2017, 12:40:00 PM (8 years ago)

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.cc (modified) (2 diffs)

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

@@ -39 +39 @@
 
 #include "Scene.h"
-#include "Level.h"
 #include "infos/PlayerInfo.h"
 #include "controllers/NewHumanController.h"
@@ -68 +67 @@
         this->camera_ = nullptr;
         this->xmlcontroller_ = nullptr;
+        //this->controller_ = nullptr;
         this->reverseCamera_ = nullptr;
         this->bDestroyWhenPlayerLeft_ = false;