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

Timestamp:

Nov 23, 2015, 11:17:22 AM (9 years ago)

Author:

gania

Message:

minor bugfixes and code style improvement

File:

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

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

@@ -85 +85 @@
             CommonController* newLeader = findNewLeader();
             this->myLeader_ = newLeader;
-            if (newLeader)
-            {
-                //orxout(internal_error) << "new Leader set" << endl;
-            }
-            //----If no leader found, attack someone----
-            //----TODO: find closest enemy----
-            else
-            {
-                if ( !this->hasTarget() || this->action_ != Action::FIGHT )
-                {
-                    for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
-                    {
-                        if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(*itP)) )
-                            continue;   
-                        this->setAction(Action::FIGHT, (*itP));
-                        break;
-                    }
-                }
-            }
+           
         }
         //----If have leader, he will deal with logic----
         else
         {
-
+            this->action_ = this->myLeader_->getAction();
         }
 
@@ -115 +97 @@
         if (this->action_ == Action::FIGHT)
         {
-            //----choose where to go----
-            this->maneuver();
-            //----fire if you can----
-            this->bShooting_ = this->canFire();
+            //----If no leader found, attack someone----
+            if (!this->hasTarget() && !this->myLeader_)
+            {
+                this->setClosestTarget(); 
+            }
+            if (this->hasTarget())
+            {
+                //----choose where to go----
+                this->maneuver();
+                //----fire if you can----
+                this->bShooting_ = this->canFire();                
+            }
         }
         //----action was set to fly, leader handles the logic----
@@ -125 +115 @@
 
         }
-        //----TODO: implement protect----
+        //----gani-TODO: implement protect----
         else if (this->action_ == Action::PROTECT)
         {