Changeset 11662 for code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc

Timestamp:

Dec 11, 2017, 4:35:38 PM (6 years ago)

Author:

kohlia

Message:

Crashes when killing the player

File:

• code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) (7 diffs)

code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller.cc

@@ -35 +35 @@
     if((ret = luaL_loadfile(lua, file_path.c_str())) != 0)
     {
+        orxout(user_error) << "Failed to load level script " + file_path << std::endl;
         this->printLuaError(lua);
         delete api;
@@ -43 +44 @@
     if((ret = lua_pcall(lua, 0, LUA_MULTRET, 0)) != 0)
     {
+        orxout(user_error) << "Level script returned an error" << std::endl;
         this->printLuaError(lua);
         delete api;
@@ -86 +88 @@
 
     for(auto &api : this->apis_)
-        api->pawnKilled(pawn_id_iter->second);
+        api->pawnKilled(pawn_id_iter->second, pawn);
 
     this->pawns_.erase(pawn_id_iter->second);
@@ -110 +112 @@
 void ScriptableController::killPawn(std::string id)
 {
-    auto pawn = this->pawns_.find(id);
-    if(pawn == this->pawns_.end())
+    auto pawn = this->getPawnByID(id);
+    if(pawn == nullptr)
     {
         orxout(user_warning) << "Tried to destroy unknown pawn " << id << std::endl;
@@ -117 +119 @@
     }
 
-    pawn->second->kill();
+    pawn->kill();
 }
 
@@ -141 +143 @@
 Pawn *ScriptableController::getPawnByID(std::string id) const
 {
+    if(id == "player" || id == "Player" || id == "PLAYER")
+        return orxonox_cast<Pawn*>(this->player_->getControllableEntity());
+
     auto pawn = this->pawns_.find(id);
     return pawn != this->pawns_.end() ? pawn->second : nullptr;
@@ -151 +156 @@
     // Yes, this is 'const char*' and not 'std::string' because that's what lua gives us.
     const char* message = lua_tostring(lua, -1);
-    std::cout << message << std::endl;
+    orxout(user_error) << message << std::endl;
     lua_pop(lua, 1);
 }