Changeset 8953 for code/branches/formation/src/orxonox/controllers/Masterable.h

Timestamp:

Nov 30, 2011, 4:09:25 PM (14 years ago)

Author:

willis

Message:

added different Modes, debugging

File:

• code/branches/formation/src/orxonox/controllers/Masterable.h (modified) (2 diffs)

code/branches/formation/src/orxonox/controllers/Masterable.h

@@ -88 +88 @@
       */ 
       enum Mode {NORMAL,DEFEND,ATTACK};
+      
       /**
-        @brief set a mode in formation
-      */ 
-      void setMode(Mode mode);
-       /**
-        @brief get the current mode
+        @brief Sets the new mode. If master, set it for all slaves.
       */
-      Mode getMode();
-      
+      void setMode(Mode val);
+      inline Mode getMode() const
+           { return this->mode_; }
+
     protected:
       bool formationFlight_;
@@ -104 +103 @@
       int freedomCount_;
       enum State {SLAVE, MASTER, FREE};
+      
       State state_;
       std::vector<Masterable*> slaves_;
       Masterable* myMaster_;
+
+      Mode mode_;
 
       enum SpecificMasterAction {NONE, HOLD, SPIN, TURN180, FOLLOW};