Changeset 7090 for code/branches/presentation3/src/orxonox

Timestamp:

Jun 2, 2010, 9:44:22 PM (14 years ago)

Author:

dafrick

Message:

Merged ppspickups4 branch.

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/AIController.cc (modified) (3 diffs)
• src/orxonox/controllers/ArtificialController.cc (modified) (1 diff)

code/branches/presentation3/src/orxonox/controllers/AIController.cc

@@ -33 +33 @@
 #include "core/Executor.h"
 #include "worldentities/ControllableEntity.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -210 +211 @@
             {
                 if (this->target_)
-                    this->aimAtTarget();
+                {
+                                if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
+                        this->forgetTarget();
+                else this->aimAtTarget();
+            }
 
                 if (this->bHasTargetPosition_)
@@ -239 +244 @@
         {
             if (this->target_)
-                this->aimAtTarget();
+            {
+                                if (!this->target_->getRadarVisibility()) /* So AI won't shoot invisible Spaceships */
+                        this->forgetTarget();
+                else this->aimAtTarget();
+            }
 
             if (this->bHasTargetPosition_)

code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc

@@ -760 +760 @@
                 continue;
 
+            /* So AI won't choose invisible Spaceships as target */
+            if (!it->getRadarVisibility())
+                continue;
+
             if (static_cast<ControllableEntity*>(*it) != this->getControllableEntity())
             {