Changeset 9615 for code/branches/formationupdate/src

Timestamp:

Apr 23, 2013, 1:42:53 PM (12 years ago)

Author:

maxima

Message:

If the HumanController dies but had slaves,
then the Controller changes to one of his slaves

File:

• code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/formationupdate/src/orxonox/worldentities/pawns/Pawn.cc

@@ -325 +325 @@
                         }
                 }
+                orxout(user_warning) << "The HumanController has no slaves!" << endl;
                 return false;
     }
@@ -359 +360 @@
                  * Doesn't work yet
                  *
-                 * if(this->hasSlaves())
+                 */ if(this->hasSlaves())
                 {
                                 // start to control a slave
                                 this->getPlayer()->startControl(this->getSlave()->getControllableEntity());
-                }*/
-                this->getPlayer()->stopControl();
+                }
+                 else{
+                         this->getPlayer()->stopControl();
+                 }
             }
             if (GameMode::isMaster())