[Orxonox-commit 6059] r10718 - code/branches/AI_HS15/src/orxonox/controllers

[gania at orxonox.net]

Author: gania
Date: 2015-10-29 13:17:02 +0100 (Thu, 29 Oct 2015)
New Revision: 10718

Modified:
   code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc
   code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h
   code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc
   code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h
Log:
bugfix

Modified: code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc	2015-10-29 10:53:45 UTC (rev 10717)
+++ code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc	2015-10-29 12:17:02 UTC (rev 10718)
@@ -46,6 +46,10 @@
         {
            
         }
+    } void DivisionController::tick(float dt)
+    {
+                SUPER(DivisionController, tick, dt);
+
     }
     bool DivisionController::setFollower(LeaderController* myFollower)
     {

Modified: code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h	2015-10-29 10:53:45 UTC (rev 10717)
+++ code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h	2015-10-29 12:17:02 UTC (rev 10718)
@@ -39,7 +39,7 @@
 namespace orxonox
 {
     class _OrxonoxExport DivisionController : public LeaderController
-    {
+      {
         public:
         	DivisionController(Context* context);
         	virtual ~DivisionController();

Modified: code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc	2015-10-29 10:53:45 UTC (rev 10717)
+++ code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc	2015-10-29 12:17:02 UTC (rev 10718)
@@ -27,8 +27,14 @@
  */
 
 #include "LeaderController.h"
+#include "core/CoreIncludes.h"
 
+#include "core/XMLPort.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
+#include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Pawn.h"
+
 namespace orxonox
 {
 

Modified: code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h
===================================================================
--- code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h	2015-10-29 10:53:45 UTC (rev 10717)
+++ code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h	2015-10-29 12:17:02 UTC (rev 10718)
@@ -39,7 +39,7 @@
 
 namespace orxonox
 {
-    class _OrxonoxExport LeaderController : public CommonController, public Tickable
+    class _OrxonoxExport LeaderController : public CommonController,  virtual public Tickable
     {
         public: