Changeset 10877 for code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc

Timestamp:

Nov 27, 2015, 4:42:14 PM (9 years ago)

Author:

gania

Message:

CommonController now has static methods only. Replace with a namespace?

File:

• code/branches/campaignHS15/src/orxonox/controllers/SectionController.cc (modified) (1 diff)

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

@@ -315 +315 @@
         return 0;
     }
-    bool SectionController::setWingman(CommonController* cwingman)
-    {
-        WeakPtr<WingmanController> wingman = orxonox_cast<WingmanController*>(cwingman);
+    bool SectionController::setWingman(ActionpointController* wingman)
+    {
+        WingmanController* newWingman = orxonox_cast<WingmanController*>(wingman);
 
         if (!this->myWingman_)
         {
-            this->myWingman_ = wingman;
+            this->myWingman_ = newWingman;
             return true;
         }