diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-08-05 00:49:35 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-08-05 21:13:03 -0400 |
| commit | bcf47bc67cf3e1c2f410a81e26ceab1bdab06b4a (patch) | |
| tree | 11bd99b70ceb33175d7883cea4ab287cc5b09175 /src/script/lua_api | |
| parent | 3183d5a4038f16b5b4cbcfd0dac5f8d458bf8ba2 (diff) | |
| download | minetest-bcf47bc67cf3e1c2f410a81e26ceab1bdab06b4a.tar.gz minetest-bcf47bc67cf3e1c2f410a81e26ceab1bdab06b4a.tar.bz2 minetest-bcf47bc67cf3e1c2f410a81e26ceab1bdab06b4a.zip | |
Improve Script CPP API diagnostics
Diffstat (limited to 'src/script/lua_api')
| -rw-r--r-- | src/script/lua_api/l_env.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index 50c445d50..48c46c079 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -77,8 +77,9 @@ void LuaABM::trigger(ServerEnvironment *env, v3s16 p, MapNode n, pushnode(L, n, env->getGameDef()->ndef()); lua_pushnumber(L, active_object_count); lua_pushnumber(L, active_object_count_wider); - if(lua_pcall(L, 4, 0, errorhandler)) - script_error(L); + + PCALL_RESL(L, lua_pcall(L, 4, 0, errorhandler)); + lua_pop(L, 1); // Pop error handler } @@ -418,8 +419,9 @@ int ModApiEnvMod::l_add_item(lua_State *L) return 0; lua_pushvalue(L, 1); lua_pushstring(L, item.getItemString().c_str()); - if(lua_pcall(L, 2, 1, errorhandler)) - script_error(L); + + PCALL_RESL(L, lua_pcall(L, 2, 1, errorhandler)); + lua_remove(L, errorhandler); // Remove error handler return 1; } |