Changeset 10958 for code/branches/campaignHS15/src/orxonox/controllers/MasterController.h

Timestamp:

Dec 8, 2015, 1:02:25 PM (10 years ago)

Author:

gania

Message:

separated MasterController from my hierarchy

File:

• code/branches/campaignHS15/src/orxonox/controllers/MasterController.h (modified) (3 diffs)

code/branches/campaignHS15/src/orxonox/controllers/MasterController.h

@@ -30 +30 @@
 #define _MasterController_H__
 
-#include "controllers/FightingController.h"
+#include "controllers/Controller.h"
+#include "controllers/ActionpointController.h"
 #include "tools/interfaces/Tickable.h"
 
@@ -50 +51 @@
       </Pawn>
     */
-    class _OrxonoxExport MasterController : public FightingController, public Tickable
+    class _OrxonoxExport MasterController : public Controller, public Tickable
     {
         public:
@@ -67 +68 @@
           
         private:
-            std::vector<WeakPtr<FightingController> > controllers_;  //<! vector of controllers, which action(), canFire() and maneuver() methods are to be called
+            std::vector<WeakPtr<ActionpointController> > controllers_;  //<! vector of controllers, which action(), canFire() and maneuver() methods are to be called
             size_t indexOfCurrentController_;                        //<! index of current controller
             unsigned int numberOfTicksPassedSinceLastActionCall_;