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

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.cc (modified) (3 diffs)

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

@@ -27 +27 @@
  */
 #include "controllers/CommonController.h"
-#include "core/XMLPort.h"
 
 //stuff for sameTeam function
+#include "gametypes/TeamDeathmatch.h"
+#include "gametypes/Gametype.h"
+#include "controllers/DroneController.h"
+#include "gametypes/Dynamicmatch.h"
+
 #include "worldentities/pawns/TeamBaseMatchBase.h"
-#include "gametypes/TeamDeathmatch.h"
-#include "gametypes/Dynamicmatch.h"
-#include "gametypes/Mission.h"
-#include "gametypes/Gametype.h"
-#include "controllers/WaypointPatrolController.h"
-#include "controllers/NewHumanController.h"
-#include "controllers/DroneController.h"
-#include "util/Math.h"
 
 namespace orxonox
@@ -44 +40 @@
 
     RegisterClass( CommonController );
-    const float SPEED = 0.9f/0.02f;
-    const float ROTATEFACTOR = 1.0f/0.02f;
 
-  
     CommonController::CommonController( Context* context ): Controller( context )
     {
-        this->bFirstTick_ = true;
-       
         RegisterObject( CommonController );
-
     }
     CommonController::~CommonController() 
@@ -59 +49 @@
         
     }
-    void CommonController::tick(float dt)
-    {
-        
-        SUPER(CommonController, tick, dt);
-    }
-
-      
-    void CommonController::XMLPort( Element& xmlelement, XMLPort::Mode mode )
-    {
-        SUPER( CommonController, XMLPort, xmlelement, mode );
-    }
- 
-    //"Virtual" methods
-    bool CommonController::setWingman ( CommonController* wingman )
-    { return false; }
-    bool CommonController::hasWingman() 
-    { return true; }
 
     float CommonController::randomInRange( float a, float b )