Changeset 8991 for code/branches/formation/src/orxonox/controllers/HumanController.cc

Timestamp:

Dec 16, 2011, 4:56:15 PM (13 years ago)

Author:

jo

Message:

Works. (Seperate/independent states are used to manage the behaviour).

File:

• code/branches/formation/src/orxonox/controllers/HumanController.cc (modified) (4 diffs)

code/branches/formation/src/orxonox/controllers/HumanController.cc

@@ -106 +106 @@
         if (HumanController::localController_s && HumanController::localController_s->state_==MASTER)
         {
-            if (HumanController::localController_s->mode_!=ATTACK)
+            if (HumanController::localController_s->formationMode_ != ATTACK)
                 HumanController::localController_s->commandSlaves();
         }
@@ -177 +177 @@
             HumanController::localController_s->controllableEntity_->fire(firemode);
             //if human fires, set slaves free. See FormationController::forceFreeSlaves()
-            if (HumanController::localController_s->state_==MASTER && HumanController::localController_s->mode_==NORMAL)
+            if (HumanController::localController_s->state_==MASTER && HumanController::localController_s->formationMode_ == NORMAL)
             {
                 HumanController::localController_s->forceFreeSlaves();
@@ -317 +317 @@
         if (HumanController::localController_s && HumanController::localController_s->state_==MASTER)
         {
-            switch (HumanController::localController_s->getMode()) {
+            switch (HumanController::localController_s->getFormationMode()) {
                 case NORMAL:
-                    HumanController::localController_s->setMode(DEFEND);
+                    HumanController::localController_s->setFormationMode(DEFEND);
                     orxout(message) <<"Mode: DEFEND "<< endl;
                     break;
                 case DEFEND:
-                    HumanController::localController_s->setMode(ATTACK);
+                    HumanController::localController_s->setFormationMode(ATTACK);
                     orxout(message) <<"Mode: ATTACK "<< endl;
                     break;
                 case ATTACK:
-                    HumanController::localController_s->setMode(NORMAL);
+                    HumanController::localController_s->setFormationMode(NORMAL);
                     orxout(message) <<"Mode: NORMAL "<< endl;
                     break;
-                default: //catch all non-formation related states
-                    break;
             }
         }
@@ -340 +338 @@
     void HumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
     {
-        if (!this->formationFlight_ || this->state_!=MASTER || this->mode_!=DEFEND) return;
+        if (!this->formationFlight_ || this->state_!=MASTER || this->formationMode_!=DEFEND) return;
             this->masterAttacked(originator);
     }