[Orxonox-commit 3553] r8239 - code/branches/ai/src/orxonox/controllers

jo at orxonox.net jo at orxonox.net
Tue Apr 12 21:51:52 CEST 2011


Author: jo
Date: 2011-04-12 21:51:52 +0200 (Tue, 12 Apr 2011)
New Revision: 8239

Modified:
   code/branches/ai/src/orxonox/controllers/ArtificialController.cc
Log:
I forgot to remove that line.

Modified: code/branches/ai/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/ai/src/orxonox/controllers/ArtificialController.cc	2011-04-12 19:41:33 UTC (rev 8238)
+++ code/branches/ai/src/orxonox/controllers/ArtificialController.cc	2011-04-12 19:51:52 UTC (rev 8239)
@@ -1025,7 +1025,6 @@
     */
     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", ...
         {
             this->setupWeapons();




More information about the Orxonox-commit mailing list