Changeset 8238 for code/branches/ai/src/orxonox/controllers/ArtificialController.cc

Timestamp:

Apr 12, 2011, 9:41:33 PM (14 years ago)

Author:

jo

Message:

Drone (almost) doesn't shoot at it's owner anymore.

File:

• code/branches/ai/src/orxonox/controllers/ArtificialController.cc (modified) (2 diffs)

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

@@ -1026 +1026 @@
     void ArtificialController::doFire()
     {
+        if(ArtificialController::friendlyFire()) return;//catch if the bot would do friendlyFire
         if(!bSetupWorked)//setup: find out which weapons are active ! hard coded: laser is "0", lens flare is "1", ...
         {
@@ -1065 +1066 @@
         }
     }
+
     
     void ArtificialController::setBotLevel(float level)