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

Timestamp:

Apr 23, 2013, 3:47:49 PM (12 years ago)

Author:

maxima

Message:

A few changes of the death function. Tried to change the master of the formation.

File:

• code/branches/formationupdate/src/orxonox/controllers/FormationController.h (modified) (2 diffs)

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

@@ -59 +59 @@
       static void passivebehaviour(const bool passive);
       static void formationsize(const int size);
+      void takeLeadOfFormation();
 
       inline void setFormationFlight(bool formation)
@@ -139 +140 @@
       bool forcedFree();
 
-      void takeLeadOfFormation();
       void masterAttacked(Pawn* originator);