diff options
author | ShadowNinja <shadowninja@minetest.net> | 2014-03-15 16:01:06 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2014-03-15 16:01:06 -0400 |
commit | f8b75555586e0e67d8320a804b9e077d29b96403 (patch) | |
tree | f992793df77298fab89185848d81ebe5f05da3a6 /src/script/cpp_api/s_inventory.cpp | |
parent | 23be6450a115954b281c045aefacbefba6837b6f (diff) | |
download | hax-minetest-server-f8b75555586e0e67d8320a804b9e077d29b96403.tar.gz hax-minetest-server-f8b75555586e0e67d8320a804b9e077d29b96403.zip |
Revert "Make sure we get a stacktrace for as many lua errors as possible"
This reverts commit 362ef5f6ced862daa4733034810d0b07e2ad5d89.
Stack tracebacks couldn't be generated in LuaError::LuaError anyway and this
caused a second, empty traceback in most cases. In cases where there wasn't
annother traceback the stack had already unwound and the traceback was empty.
Diffstat (limited to 'src/script/cpp_api/s_inventory.cpp')
-rw-r--r-- | src/script/cpp_api/s_inventory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/script/cpp_api/s_inventory.cpp b/src/script/cpp_api/s_inventory.cpp index c4912163a..db3c13fe0 100644 --- a/src/script/cpp_api/s_inventory.cpp +++ b/src/script/cpp_api/s_inventory.cpp @@ -54,7 +54,7 @@ int ScriptApiDetached::detached_inventory_AllowMove( if(lua_pcall(L, 7, 1, errorhandler)) scriptError(); if(!lua_isnumber(L, -1)) - throw LuaError(L, "allow_move should return a number"); + throw LuaError(NULL, "allow_move should return a number"); int ret = luaL_checkinteger(L, -1); lua_pop(L, 2); // Pop integer and error handler return ret; @@ -86,7 +86,7 @@ int ScriptApiDetached::detached_inventory_AllowPut( if(lua_pcall(L, 5, 1, errorhandler)) scriptError(); if(!lua_isnumber(L, -1)) - throw LuaError(L, "allow_put should return a number"); + throw LuaError(NULL, "allow_put should return a number"); int ret = luaL_checkinteger(L, -1); lua_pop(L, 2); // Pop integer and error handler return ret; @@ -118,7 +118,7 @@ int ScriptApiDetached::detached_inventory_AllowTake( if(lua_pcall(L, 5, 1, errorhandler)) scriptError(); if(!lua_isnumber(L, -1)) - throw LuaError(L, "allow_take should return a number"); + throw LuaError(NULL, "allow_take should return a number"); int ret = luaL_checkinteger(L, -1); lua_pop(L, 2); // Pop integer and error handler return ret; |