Changeset 11167 for code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.cc

Timestamp:

Apr 14, 2016, 4:03:16 PM (8 years ago)

Author:

plehmann

Message:

changed the NewScriptController and Task classes

File:

• code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.cc (modified) (5 diffs)

code/branches/plehmannFS16/src/orxonox/controllers/ControllerDirector.cc

@@ -6 +6 @@
 
 #include "ControllerDirector.h"
-#include "ScriptController.h"
+#include "NewScriptController.h"
 #include "core/CoreIncludes.h"
 
@@ -64 +64 @@
     {
        /* Output a message confirming that the function was called */
-       orxout(verbose)<<"test takecontrol."<< endl;
+       orxout()<<"test takecontrol."<< endl;
 
        /* First, we set up a new controller to attach to the unit that
@@ -74 +74 @@
        {
          /* Create a scriptcontroller object */
-         ScriptController *newctrl = new ScriptController(this->context_);
+         NewScriptController *newctrl = new NewScriptController(this->context_);
 
          /* Make the player we were given its slave */
@@ -112 +112 @@
         this->player_ = nullptr;
 
-        orxout(verbose) << "Preparation to take Control!" << endl; 
+        orxout() << "Preparation to take Control!" << endl; 
 
         // Check whether it is a player trigger and extract pawn from it
@@ -125 +125 @@
         else
         {
-            orxout(verbose) << "ControllerDirector::preparationToTakeControl " 
+            orxout() << "ControllerDirector::preparationToTakeControl " 
               << "Not a player trigger, can't extract pawn from it.." << endl;
             return false;