diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-25 19:49:20 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:52 +0200 |
| commit | 9e7ad1e2aa832ff93a623e7a1531cee1f1e79ef7 (patch) | |
| tree | 92ebc9ff4a3750206f52b52858de1a4289d6f16d /src/scriptapi.cpp | |
| parent | ae9f183cda7046028e6d74972922dc41cf6039bf (diff) | |
| download | minetest-9e7ad1e2aa832ff93a623e7a1531cee1f1e79ef7.tar.gz minetest-9e7ad1e2aa832ff93a623e7a1531cee1f1e79ef7.tar.bz2 minetest-9e7ad1e2aa832ff93a623e7a1531cee1f1e79ef7.zip | |
Add object reference to Lua on_place/dig/punchnode parameters
Diffstat (limited to 'src/scriptapi.cpp')
| -rw-r--r-- | src/scriptapi.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp index 5ef4f9972..a5454bea5 100644 --- a/src/scriptapi.cpp +++ b/src/scriptapi.cpp @@ -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); assert(lua_checkstack(L, 20)); @@ -1459,13 +1460,15 @@ void scriptapi_environment_on_placenode(lua_State *L, v3s16 p, MapNode newnode) // Call function pushpos(L, p); 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)); // 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); assert(lua_checkstack(L, 20)); @@ -1492,13 +1495,15 @@ void scriptapi_environment_on_dignode(lua_State *L, v3s16 p, MapNode oldnode) // Call function pushpos(L, p); 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)); // 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); 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); // Call function pushpos(L, p); - pushnode(L, oldnode, ndef); - if(lua_pcall(L, 2, 0, 0)) + pushnode(L, node, ndef); + objectref_get_or_create(L, puncher); + if(lua_pcall(L, 3, 0, 0)) script_error(L, "error: %s\n", lua_tostring(L, -1)); // value removed, keep key for next iteration } |