aboutsummaryrefslogtreecommitdiff
path: root/src/script/cpp_api
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-07-27 11:32:35 +0200
committerGitHub <noreply@github.com>2017-07-27 11:32:35 +0200
commit550c0404a8b6fbee857003c961bb802121e88f51 (patch)
tree1b408c5cbb94b8211636d621eab2622e65906137 /src/script/cpp_api
parentba959ce27f20d0887fc94da4e40880749a493cde (diff)
downloadminetest-550c0404a8b6fbee857003c961bb802121e88f51.tar.gz
minetest-550c0404a8b6fbee857003c961bb802121e88f51.tar.bz2
minetest-550c0404a8b6fbee857003c961bb802121e88f51.zip
Add LuaEntity on_death callback (#6177)
Add LuaEntity on_death callback This fixes #5474
Diffstat (limited to 'src/script/cpp_api')
-rw-r--r--src/script/cpp_api/s_entity.cpp28
-rw-r--r--src/script/cpp_api/s_entity.h1
2 files changed, 29 insertions, 0 deletions
diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp
index 4c1e296d4..a97b0c12c 100644
--- a/src/script/cpp_api/s_entity.cpp
+++ b/src/script/cpp_api/s_entity.cpp
@@ -262,6 +262,34 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
return retval;
}
+bool ScriptApiEntity::luaentity_on_death(u16 id, ServerActiveObject *killer)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ int error_handler = PUSH_ERROR_HANDLER(L);
+
+ // Get core.luaentities[id]
+ luaentity_get(L, id);
+ int object = lua_gettop(L);
+ // State: object is at top of stack
+ // Get function
+ lua_getfield(L, -1, "on_death");
+ if (lua_isnil(L, -1)) {
+ lua_pop(L, 2); // Pop on_death and entity
+ return false;
+ }
+ luaL_checktype(L, -1, LUA_TFUNCTION);
+ lua_pushvalue(L, object); // self
+ objectrefGetOrCreate(L, killer); // killer reference
+
+ setOriginFromTable(object);
+ PCALL_RES(lua_pcall(L, 6, 1, error_handler));
+
+ bool retval = lua_toboolean(L, -1);
+ lua_pop(L, 2); // Pop object and error handler
+ return retval;
+}
+
// Calls entity:on_rightclick(ObjectRef clicker)
void ScriptApiEntity::luaentity_Rightclick(u16 id,
ServerActiveObject *clicker)
diff --git a/src/script/cpp_api/s_entity.h b/src/script/cpp_api/s_entity.h
index 4e2a056bb..07b06edff 100644
--- a/src/script/cpp_api/s_entity.h
+++ b/src/script/cpp_api/s_entity.h
@@ -41,6 +41,7 @@ public:
bool luaentity_Punch(u16 id,
ServerActiveObject *puncher, float time_from_last_punch,
const ToolCapabilities *toolcap, v3f dir, s16 damage);
+ bool luaentity_on_death(u16 id, ServerActiveObject *killer);
void luaentity_Rightclick(u16 id,
ServerActiveObject *clicker);
};