Changeset 10631 for code/trunk/src/orxonox/controllers/FormationController.cc

Timestamp:

Oct 10, 2015, 6:38:44 PM (10 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.

File:

• code/trunk/src/orxonox/controllers/FormationController.cc (modified) (1 diff)

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();
+    }
 }