Changeset 10631 for code/trunk

Timestamp:

Oct 10, 2015, 6:38:44 PM (9 years ago)

Author:

landauf

Message:

the AI sometimes selected its own ship as target while it was steering a rocket. after destroying the rocket, the AI would then try to hit itself which led to random crashes (because of a division by zero error which was previously fixed in r10630).
this commit does not fix the root cause, but detects this case and changes the target.

Location:

code/trunk/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (1 diff)
• FormationController.cc (modified) (1 diff)
• FormationController.h (modified) (1 diff)
• NewHumanController.cc (modified) (1 diff)

code/trunk/src/orxonox/controllers/ArtificialController.cc

@@ -82 +82 @@
     void ArtificialController::changedControllableEntity()
     {
+        FormationController::changedControllableEntity(); // super
+
         if (!this->getControllableEntity())
             this->removeFromFormation();

code/trunk/src/orxonox/controllers/FormationController.cc

@@ -1087 +1087 @@
     }
 
+    void FormationController::changedControllableEntity()
+    {
+        Controller::changedControllableEntity(); // super
+
+        // when changing the controllable entity, ensure that the controller does not use the new entity as target
+        if (this->target_ && this->getControllableEntity() == static_cast<ControllableEntity*>(this->target_))
+            this->forgetTarget();
+    }
 }

code/trunk/src/orxonox/controllers/FormationController.h

@@ -99 +99 @@
       FormationController* getSlave( void ) { return this->slaves_.back(); }
 
+      virtual void changedControllableEntity();
+
   protected:
       bool formationFlight_;

code/trunk/src/orxonox/controllers/NewHumanController.cc

@@ -496 +496 @@
     void NewHumanController::changedControllableEntity()
     {
+        HumanController::changedControllableEntity(); // super
+
         this->controlMode_ = 0;
         this->centerCursor();