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

Timestamp:

Dec 7, 2015, 4:06:37 PM (8 years ago)

Author:

gania

Message:

fix for sigsegv?

File:

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

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

@@ -31 +31 @@
 
 
-#include "controllers/Controller.h"
-#include <limits>
+#include "controllers/Controller.h"                 //that's what I inherit from
 
-#include "worldentities/ControllableEntity.h"
-#include "worldentities/pawns/Pawn.h"
+#include <limits>                                   //I use limits pretty much in every class, so might as well include it in the parent class
+
+#include "worldentities/ControllableEntity.h"       //same for ControllableEntity
+#include "worldentities/pawns/Pawn.h"               //and Pawn
 
 
@@ -44 +45 @@
 
         public:
-            static const float ACTION_INTERVAL = 1.0f;
-
-            static const float hardcoded_projectile_speed = 750;
+            static const float hardcoded_projectile_speed = 750;        //<! FightingController uses it to predict enemy position
 
             CommonController(Context* context);
@@ -52 +51 @@
 
             static float randomInRange(float a, float b);
-            static float distance(ControllableEntity* entity1, ControllableEntity* entity2);
+            static float distance(const ControllableEntity* entity1, const ControllableEntity* entity2);
             static bool sameTeam (ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gt);
-            static bool isLooking( ControllableEntity* entityThatLooks, ControllableEntity* entityBeingLookedAt, float angle ) ;
-            static std::string getName( Pawn* entity ) ;           
+            static bool isLooking(const ControllableEntity* entityThatLooks, const ControllableEntity* entityBeingLookedAt, float angle ) ;
+            static std::string getName(const Pawn* entity ) ;           
     };
 }