[Orxonox-commit 2353] r7068 - code/branches/ppspickups4/src/orxonox/controllers

[ebeier at orxonox.net]

Author: ebeier
Date: 2010-05-31 19:11:25 +0200 (Mon, 31 May 2010)
New Revision: 7068

Modified:
   code/branches/ppspickups4/src/orxonox/controllers/AIController.cc
   code/branches/ppspickups4/src/orxonox/controllers/ArtificialController.cc
Log:
bot's won't shoot invisible players anymore!


Modified: code/branches/ppspickups4/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/ppspickups4/src/orxonox/controllers/AIController.cc	2010-05-31 16:41:01 UTC (rev 7067)
+++ code/branches/ppspickups4/src/orxonox/controllers/AIController.cc	2010-05-31 17:11:25 UTC (rev 7068)
@@ -32,6 +32,7 @@
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
 #include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
 {
@@ -102,6 +103,8 @@
             return;
 
         if (this->target_)
+            if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
+                this->forgetTarget();
             this->aimAtTarget();
 
         if (this->bHasTargetPosition_)

Modified: code/branches/ppspickups4/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/ppspickups4/src/orxonox/controllers/ArtificialController.cc	2010-05-31 16:41:01 UTC (rev 7067)
+++ code/branches/ppspickups4/src/orxonox/controllers/ArtificialController.cc	2010-05-31 17:11:25 UTC (rev 7068)
@@ -112,6 +112,10 @@
             if (ArtificialController::sameTeam(this->getControllableEntity(), static_cast<ControllableEntity*>(*it), this->getGametype()))
                 continue;
 
+            /* So AI won't choose invisible Spaceships as target */
+            if (!it->getRadarVisibility())
+                continue;
+
             if (static_cast<ControllableEntity*>(*it) != this->getControllableEntity())
             {
                 float speed = this->getControllableEntity()->getVelocity().length();