Changeset 9617 for code/branches/formationupdate/src/orxonox/controllers

Timestamp:

Apr 30, 2013, 3:12:11 PM (12 years ago)

Author:

maxima

Message:

The AIController of the new HumanController is deleted.

Location:

code/branches/formationupdate/src/orxonox/controllers

Files:

• Controller.h (modified) (1 diff)
• FormationController.h (modified) (2 diffs)
• HumanController.h (modified) (1 diff)

code/branches/formationupdate/src/orxonox/controllers/Controller.h

@@ -65 +65 @@
             virtual void changedControllableEntity() {}
 
-        protected:
             // don't use this directly, use getPlayer()->startControl(entity) (unless you know exactly what you do)
             inline void setControllableEntity(ControllableEntity* entity)

code/branches/formationupdate/src/orxonox/controllers/FormationController.h

@@ -60 +60 @@
       static void formationsize(const int size);
       void takeLeadOfFormation();
+      void loseMasterState();
 
       inline void setFormationFlight(bool formation)
@@ -136 +137 @@
       void freeSlaves();
       void forceFreeSlaves();
-      void loseMasterState();
       void forceFreedom();
       bool forcedFree();

code/branches/formationupdate/src/orxonox/controllers/HumanController.h

@@ -102 +102 @@
             //friend class, for mouselook
             friend class Map;
+            static HumanController* localController_s;
 
         protected:
-            static HumanController* localController_s;
             bool controlPaused_;