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

Timestamp:

Dec 14, 2017, 4:04:14 PM (7 years ago)

Author:

kohlia

Message:

The ScriptableController should work now. A demo level called scriptableControllerTest exists as well.

File:

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

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

@@ -50 +50 @@
     }
 
-    // Remeber the api
+    // Remember the api
     this->apis_.push_back(std::unique_ptr<ScriptableControllerAPI>(api));
 
@@ -73 +73 @@
 void ScriptableController::registerPawn(std::string id, Pawn *pawn)
 {
-    this->worldEntities_[id] = pawn;
     this->pawns_[id] = pawn;
     this->pawnsReverse_[pawn] = id;
@@ -87 +86 @@
     }
 
-    for(auto &api : this->apis_)
-        api->pawnKilled(pawn_id_iter->second, pawn);
-
+    // The ID of the pawn should already be invalid when we call the callback
+    std::string id = pawn_id_iter->second;
     this->pawns_.erase(pawn_id_iter->second);
     this->pawnsReverse_.erase(pawn_id_iter);
+
+    for(auto &api : this->apis_)
+        api->pawnKilled(id, pawn);
 }
 
@@ -110 +111 @@
 }
 
-void ScriptableController::killPawn(std::string id)
-{
-    auto pawn = this->getPawnByID(id);
-    if(pawn == nullptr)
-    {
-        orxout(user_warning) << "Tried to destroy unknown pawn " << id << std::endl;
-        return;
-    }
-
-    pawn->kill();
-}
-
 WorldEntity *ScriptableController::getWorldEntityByID(std::string id) const
 {
@@ -138 +127 @@
     auto entity = this->mobileEntities_.find(id);
     return entity != this->mobileEntities_.end() ? entity->second : nullptr;
-
 }