Changeset 10718

Timestamp:

Oct 29, 2015, 1:17:02 PM (9 years ago)

Author:

gania

Message:

bugfix

Location:

code/branches/AI_HS15/src/orxonox/controllers

Files:

• DivisionController.cc (modified) (1 diff)
• DivisionController.h (modified) (1 diff)
• LeaderController.cc (modified) (1 diff)
• LeaderController.h (modified) (1 diff)

code/branches/AI_HS15/src/orxonox/controllers/DivisionController.cc

@@ -47 +47 @@
            
         }
+    } void DivisionController::tick(float dt)
+    {
+                SUPER(DivisionController, tick, dt);
+
     }
     bool DivisionController::setFollower(LeaderController* myFollower)

code/branches/AI_HS15/src/orxonox/controllers/DivisionController.h

@@ -40 +40 @@
 {
     class _OrxonoxExport DivisionController : public LeaderController
-    {
+      {
         public:
                 DivisionController(Context* context);

code/branches/AI_HS15/src/orxonox/controllers/LeaderController.cc

@@ -28 +28 @@
 
 #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

code/branches/AI_HS15/src/orxonox/controllers/LeaderController.h

@@ -40 +40 @@
 namespace orxonox
 {
-    class _OrxonoxExport LeaderController : public CommonController, public Tickable
+    class _OrxonoxExport LeaderController : public CommonController,  virtual public Tickable
     {
         public: