Changeset 10958 for code/branches/campaignHS15/src/orxonox/controllers/MasterController.cc

Timestamp:

Dec 8, 2015, 1:02:25 PM (10 years ago)

Author:

gania

Message:

separated MasterController from my hierarchy

File:

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

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

@@ -35 +35 @@
 
     //Leaders share the fact that they have Wingmans
-    MasterController::MasterController(Context* context) : FightingController(context)
+    MasterController::MasterController(Context* context) : Controller(context)
     {
         RegisterObject(MasterController);
@@ -120 +120 @@
                 }
                 //orxout (internal_error) << "Executing action of Controller # " << this->indexOfCurrentController_ << endl;
-                this->controllers_.at(this->indexOfCurrentController_)->action();
+                this->controllers_.at(this->indexOfCurrentController_)->action();    
+                //bCopyOrientation makes ship oscillate like crazy if set to true all the time.s
+                this->controllers_.at(this->indexOfCurrentController_)->bCopyOrientation_ = this->ticks_ % 3 == 0;
 
                 ++this->numberOfTicksPassedSinceLastActionCall_;