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

Timestamp:

Nov 27, 2015, 4:42:14 PM (8 years ago)

Author:

gania

Message:

CommonController now has static methods only. Replace with a namespace?

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.h (modified) (1 diff)

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

@@ -32 +32 @@
 
 #include "controllers/Controller.h"
+#include <limits>
+
 #include "worldentities/ControllableEntity.h"
 #include "worldentities/pawns/Pawn.h"
 
-#include "tools/Timer.h"
-#include "tools/interfaces/Tickable.h"
-#include <limits>
-#include "worldentities/Actionpoint.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport CommonController : public Controller, public Tickable
+    class _OrxonoxExport CommonController : public Controller
     {
 
         public:
+            static const float ACTION_INTERVAL = 1.0f;
+
             static const float hardcoded_projectile_speed = 750;
-            static const float ACTION_INTERVAL = 1.0f;
 
             CommonController(Context* context);
             virtual ~CommonController();
 
-            virtual void tick(float dt); 
-
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-                
-
-
-            virtual bool setWingman(CommonController* wingman);
-            virtual bool hasWingman();        
-
-
-            float randomInRange(float a, float b);
+            static float randomInRange(float a, float b);
             static float distance(ControllableEntity* entity1, 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 ) ;
-
-        protected:
-           
-            bool bFirstTick_; 
-            
-           
+            static std::string getName( Pawn* entity ) ;           
     };
 }