Changeset 10762 for code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc

Timestamp:

Nov 3, 2015, 3:56:41 PM (9 years ago)

Author:

gania

Message:

added a canFire() function

File:

• code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc (modified) (4 diffs)

code/branches/AI_HS15/src/orxonox/controllers/WingmanController.cc

@@ -111 +111 @@
     void WingmanController::tick(float dt)
     {   
-        //-------------------------------------------------------
-       /* if (this->target_)
-        {
-            this->aimAtTarget();
-            this->doFire();
-            this->bShooting_ = true;
-        }*/
+       
         
         if (!this->isActive())
             return;
-        //--------------------------Stay in formation--------------------------
         if (!this->target_)
         {
@@ -128 +121 @@
         else
         {
-            
+
         }
         if (this->bHasTargetPosition_)
@@ -135 +128 @@
         } 
         
-        //--------------------------Attack same target as the Leader--------------------------
-
-        /*if (this->target_)
-        {
-            this->aimAtTarget();
-            this->doFire();
-        }
-        */
-        
-        //orxout(internal_error) << "I am " << this << endl;
-
+       
         
         SUPER(WingmanController, tick, dt);
@@ -169 +152 @@
 
         }
+
+        if (canFire())
+            doFire();
     }