Changeset 10953 for code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc

Timestamp:

Dec 7, 2015, 8:42:03 PM (9 years ago)

Author:

gania

Message:

converted hack to a legal class

File:

• code/branches/campaignHS15/src/orxonox/controllers/CommonController.cc (modified) (3 diffs)

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

@@ -40 +40 @@
 
     RegisterClass(CommonController);
-
     CommonController::CommonController(Context* context): Controller(context)
     {
@@ -93 +92 @@
         if (controller)
         {
+            if (controller->getIdentifier()->getName() == "MasterController")
+                return true;
             CommonController* ac = orxonox_cast<CommonController*>(controller);
             if (ac)
@@ -104 +105 @@
         if (controller)
         {
+            if (controller->getIdentifier()->getName() == "MasterController")
+                return true;
             CommonController* ac = orxonox_cast<CommonController*>(controller);
             if (ac)