Changeset 10854 for code/branches/campaignHS15/src/orxonox/controllers/CommonController.h

Timestamp:

Nov 25, 2015, 12:07:22 PM (8 years ago)

Author:

gania

Message:

Fixed some bugs, only DivisionController works for now

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) (4 diffs)

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

@@ -41 +41 @@
 #include <algorithm>
 #include "worldentities/Actionpoint.h"
+#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox
@@ -133 +134 @@
             //----[/Helper methods]----
 
-             //----[Actionpoint information]----
-
-                std::vector<WeakPtr<WorldEntity> > actionpoints_;
-                float squaredaccuracy_;
-                std::vector<Point > parsedActionpoints_;
-
-            //----[/Actionpoint information]----
-                //----[Actionpoint methods]----
-                void executeActionpoint();
-                void nextActionpoint();
-            //----[Actionpoint methods]----
+             
+                virtual void stayNearProtect();
+                virtual void action(); //<! action() is called in regular intervals managing the bot's behaviour.
+            
         protected:
             //----[Flying methods]----
@@ -180 +174 @@
                 void setClosestTarget();
                 Pawn* closestTarget();
-                bool startAttackingEnemiesThatAreClose();
+                void startAttackingEnemiesThatAreClose();
             //----[/Fighting methods]----            
             
@@ -203 +197 @@
             //----[/who-to-kill information]----
 
-           
+            //----[Actionpoint information]----
+
+                std::vector<WeakPtr<WorldEntity> > actionpoints_;
+                float squaredaccuracy_;
+                std::vector<Point > parsedActionpoints_;
+
+            //----[/Actionpoint information]----
+            //----[Actionpoint methods]----
+                void executeActionpoint();
+                void nextActionpoint();
+            //----[Actionpoint methods]----
             //----["Private" variables]----
                 FormationMode::Value formationMode_;