Changeset 10882 for code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

Timestamp:

Nov 28, 2015, 10:16:31 AM (8 years ago)

Author:

gania

Message:

fixed a bug in DivisionController, made action transitions smoother

File:

• code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc (modified) (2 diffs)

code/branches/campaignHS15/src/orxonox/controllers/DivisionController.cc

@@ -117 +117 @@
         {
             this->myFollower_ = newFollower;
+            if (this->hasWingman())
+            {
+                this->myWingman_->takeActionpoints (std::vector<Point>(), std::vector<Point>(), false);
+            }
             return true;
         }
@@ -135 +139 @@
         if (this->myFollower_)
             return true;
-        else
-            return false;
+        
+        return false;
     }
 }