diff options
| -rw-r--r-- | data/mods/default/init.lua | 4 | ||||
| -rw-r--r-- | src/content_sao.cpp | 2 | ||||
| -rw-r--r-- | src/scriptapi.cpp | 7 | ||||
| -rw-r--r-- | src/scriptapi.h | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index c6c679b63..6788defa2 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -104,7 +104,9 @@ -- - getpos() -> {x=num, y=num, z=num} -- - setpos(pos); pos={x=num, y=num, z=num} -- - moveto(pos, continuous=false): interpolated move --- - punch(puncher); puncher = an another ObjectRef +-- - punch(puncher, time_from_last_punch) +-- ^ puncher = an another ObjectRef, +-- ^ time_from_last_punch = time since last punch action of the puncher -- - right_click(clicker); clicker = an another ObjectRef -- - get_wield_digging_properties() -> digging property table -- - add_to_inventory_later(itemstring): like above, but after callback returns (only allowed for craftitem callbacks) diff --git a/src/content_sao.cpp b/src/content_sao.cpp index e0f230bbc..171e315af 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1678,7 +1678,7 @@ void LuaEntitySAO::punch(ServerActiveObject *puncher, float time_from_last_punch if(!m_registered) return; lua_State *L = m_env->getLua(); - scriptapi_luaentity_punch(L, m_id, puncher); + scriptapi_luaentity_punch(L, m_id, puncher, time_from_last_punch); } void LuaEntitySAO::rightClick(ServerActiveObject *clicker) diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 951ff6f83..dce454ea4 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -3208,9 +3208,9 @@ void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime) script_error(L, "error running function 'on_step': %s\n", lua_tostring(L, -1)); } -// Calls entity:on_punch(ObjectRef puncher) +// Calls entity:on_punch(ObjectRef puncher, time_from_last_punch) void scriptapi_luaentity_punch(lua_State *L, u16 id, - ServerActiveObject *puncher) + ServerActiveObject *puncher, float time_from_last_punch) { realitycheck(L); assert(lua_checkstack(L, 20)); @@ -3228,8 +3228,9 @@ void scriptapi_luaentity_punch(lua_State *L, u16 id, luaL_checktype(L, -1, LUA_TFUNCTION); lua_pushvalue(L, object); // self objectref_get_or_create(L, puncher); // Clicker reference + lua_pushnumber(L, time_from_last_punch); // Call with 2 arguments, 0 results - if(lua_pcall(L, 2, 0, 0)) + if(lua_pcall(L, 3, 0, 0)) script_error(L, "error running function 'on_punch': %s\n", lua_tostring(L, -1)); } diff --git a/src/scriptapi.h b/src/scriptapi.h index fe9329d75..2baf6f836 100644 --- a/src/scriptapi.h +++ b/src/scriptapi.h @@ -83,7 +83,7 @@ void scriptapi_luaentity_get_properties(lua_State *L, u16 id, LuaEntityProperties *prop); void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime); void scriptapi_luaentity_punch(lua_State *L, u16 id, - ServerActiveObject *puncher); + ServerActiveObject *puncher, float time_from_last_punch); void scriptapi_luaentity_rightclick(lua_State *L, u16 id, ServerActiveObject *clicker); |