moparisthebest
/
minetest
mirror of https://github.com/moparisthebest/minetest
1
0
Fork 0
Code Issues Releases Wiki Activity

Add object reference to Lua on_place/dig/punchnode parameters

This commit is contained in:
Perttu Ahola 2011-11-25 19:49:20 +02:00
parent ae9f183cda
commit 9e7ad1e2aa
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/mods/default/init.lua
View File

@ -82,8 +82,9 @@ end
-- minetest.register_node(name, {lots of stuff}) -- minetest.register_node(name, {lots of stuff})
-- minetest.register_craft({output=item, recipe={...}) -- minetest.register_craft({output=item, recipe={...})
-- minetest.register_globalstep(func) -- minetest.register_globalstep(func)
-- minetest.register_on_placenode(func) -- minetest.register_on_placenode(func(pos, newnode, placer))
-- minetest.register_on_dignode(func) -- minetest.register_on_dignode(func(pos, oldnode, digger))
-- minetest.register_on_punchnode(func(pos, node, puncher))
-- --
-- Global objects: -- Global objects:
-- minetest.env - environment reference -- minetest.env - environment reference

20
src/scriptapi.cpp
View File

@ -1432,7 +1432,8 @@ void scriptapi_environment_step(lua_State *L, float dtime)
} }
} }
void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode) void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode,
ServerActiveObject *placer)
{ {
realitycheck(L); realitycheck(L);
assert(lua_checkstack(L, 20)); assert(lua_checkstack(L, 20));
@ -1459,13 +1460,15 @@ void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode)
// Call function // Call function
pushpos(L, p); pushpos(L, p);
pushnode(L, newnode, ndef); pushnode(L, newnode, ndef);
if(lua_pcall(L, 2, 0, 0)) objectref_get_or_create(L, placer);
if(lua_pcall(L, 3, 0, 0))
script_error(L, "error: %s\n", lua_tostring(L, -1)); script_error(L, "error: %s\n", lua_tostring(L, -1));
// value removed, keep key for next iteration // value removed, keep key for next iteration
} }
} }
void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode) void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode,
ServerActiveObject *digger)
{ {
realitycheck(L); realitycheck(L);
assert(lua_checkstack(L, 20)); assert(lua_checkstack(L, 20));
@ -1492,13 +1495,15 @@ void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode)
// Call function // Call function
pushpos(L, p); pushpos(L, p);
pushnode(L, oldnode, ndef); pushnode(L, oldnode, ndef);
if(lua_pcall(L, 2, 0, 0)) objectref_get_or_create(L, digger);
if(lua_pcall(L, 3, 0, 0))
script_error(L, "error: %s\n", lua_tostring(L, -1)); script_error(L, "error: %s\n", lua_tostring(L, -1));
// value removed, keep key for next iteration // value removed, keep key for next iteration
} }
} }
void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode oldnode) void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode node,
ServerActiveObject *puncher)
{ {
realitycheck(L); realitycheck(L);
assert(lua_checkstack(L, 20)); assert(lua_checkstack(L, 20));
@ -1524,8 +1529,9 @@ void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode oldnode)
luaL_checktype(L, -1, LUA_TFUNCTION); luaL_checktype(L, -1, LUA_TFUNCTION);
// Call function // Call function
pushpos(L, p); pushpos(L, p);
pushnode(L, oldnode, ndef); pushnode(L, node, ndef);
if(lua_pcall(L, 2, 0, 0)) objectref_get_or_create(L, puncher);
if(lua_pcall(L, 3, 0, 0))
script_error(L, "error: %s\n", lua_tostring(L, -1)); script_error(L, "error: %s\n", lua_tostring(L, -1));
// value removed, keep key for next iteration // value removed, keep key for next iteration
} }

9
src/scriptapi.h
View File

@ -41,11 +41,14 @@ void scriptapi_rm_object_reference(lua_State *L, ServerActiveObject *cobj);
// On environment step // On environment step
void scriptapi_environment_step(lua_State *L, float dtime); void scriptapi_environment_step(lua_State *L, float dtime);
// After adding node // After adding node
void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode); void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode,
ServerActiveObject *placer);
// After removing node // After removing node
void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode); void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode,
ServerActiveObject *digger);
// When punching node // When punching node
void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode node); void scriptapi_environment_on_punchnode(lua_State *L, v3s16 p, MapNode node,
ServerActiveObject *puncher);
/* luaentity */ /* luaentity */
// Returns true if succesfully added into Lua; false otherwise. // Returns true if succesfully added into Lua; false otherwise.

9
src/server.cpp
View File

@ -2529,7 +2529,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
/* /*
Run script hook Run script hook
*/ */
scriptapi_environment_on_punchnode(m_lua, p_under, n); ServerRemotePlayer *srp = (ServerRemotePlayer*)player;
scriptapi_environment_on_punchnode(m_lua, p_under, n, srp);
} // action == 0 } // action == 0
@ -2769,7 +2770,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
/* /*
Run script hook Run script hook
*/ */
scriptapi_environment_on_dignode(m_lua, p_under, n); ServerRemotePlayer *srp = (ServerRemotePlayer*)player;
scriptapi_environment_on_dignode(m_lua, p_under, n, srp);
} }
/* /*
@ -2916,7 +2918,8 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
/* /*
Run script hook Run script hook
*/ */
scriptapi_environment_on_placenode(m_lua, p_over, n); ServerRemotePlayer *srp = (ServerRemotePlayer*)player;
scriptapi_environment_on_placenode(m_lua, p_over, n, srp);
/* /*
Calculate special events Calculate special events