Changeset 11662 for code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h

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_api.h (modified) (6 diffs)

code/branches/ScriptableController_HS17/src/orxonox/scriptablecontroller/scriptable_controller_api.h

@@ -14 +14 @@
 class ScriptableController;
 class WorldEntity;
+class Pawn;
 
 /**
@@ -24 +25 @@
 class ScriptableControllerAPI
 {
+friend class ScriptableController;
+
 public:
     /**
@@ -140 +143 @@
 
     /**
+     * @brief Spawn an object
+     * @param type Name of the class of the object you want to spawn
+     * @param id The newly created ID that can be used to access this object
+     */
+    void spawn(std::string type, std::string id);
+
+    /**
      * @brief Set the position of an object
      * @param id The ID of the object
@@ -185 +195 @@
 // ### API END ################################################################
 
+private:
     /**
      * @brief Called by ScriptableController when a pawn is killed
@@ -191 +202 @@
      * Calls the lua callbacks associated with this event.
      */
-    void pawnKilled(std::string id);
+    void pawnKilled(std::string id, Pawn *pawn);
 
     /**
@@ -202 +213 @@
     void pawnHit(std::string target_id, std::string source_id, double new_health, double new_shield);
 
-private:
     /**
      * @brief Groups everything together that is needed to handle a near-object event