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

Timestamp:

Nov 13, 2017, 5:25:09 PM (6 years ago)

Author:

kohlia

Message:

Figuring out when the different things are ready in orxonox

File:

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

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

@@ -57 +57 @@
         this->xmlfilename_ = this->getFilename();
         this->xmlfile_ = nullptr;
+        this->controller_.reset(new ScriptableController());
     }
 
@@ -84 +85 @@
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
-
-        if(this->level_script_ != "")
-        {
-            this->controller_ = new ScriptableController(this->getContext());
-            this->controller_->runScript(this->level_script_);
-        }
     }
 
@@ -177 +172 @@
     {
         this->objects_.push_back(object);
-        if(this->controller_ != nullptr)
-            object->registerToScriptableController(this->controller_);
+        object->registerToScriptableController(this->controller_.get());
     }
 
@@ -214 +208 @@
         orxout(internal_info) << "player entered level (id: " << player->getClientID() << ", name: " << player->getName() << ')' << endl;
         player->switchGametype(this->getGametype());
+
+        if(player->isHumanPlayer() && player->isLocalPlayer())
+        {
+            this->getScriptableController()->setPlayer(player);
+            this->controller_->runScript(this->level_script_);
+        }
     }