Changeset 11549 for code/branches/ScriptableController_HS17/src/orxonox/Level.cc

Timestamp:

Nov 6, 2017, 5:23:08 PM (7 years ago)

Author:

kohlia

Message:

Not working yet

File:

• code/branches/ScriptableController_HS17/src/orxonox/Level.cc (modified) (2 diffs)

code/branches/ScriptableController_HS17/src/orxonox/Level.cc

@@ -87 +87 @@
         if(this->level_script_ != "")
         {
-            this->controller_.reset(new ScriptableController());
+            this->controller_ = new ScriptableController(this->getContext());
             this->controller_->runScript(this->level_script_);
         }
@@ -177 +177 @@
     {
         this->objects_.push_back(object);
-        if(this->controller_.get() != nullptr)
-            object->registerToScriptableController(this->controller_.get());
+        if(this->controller_ != nullptr)
+            object->registerToScriptableController(this->controller_);
     }