diff options
author | Sfan5 <sfan5@live.de> | 2014-03-15 14:49:30 +0100 |
---|---|---|
committer | Sfan5 <sfan5@live.de> | 2014-03-15 14:51:00 +0100 |
commit | 362ef5f6ced862daa4733034810d0b07e2ad5d89 (patch) | |
tree | beca839a42d19ec135f84c4c0b894634d281a07b /src/script/common | |
parent | d753d352f15ac3586a80b42dd4da6aca518c8ec8 (diff) | |
download | minetest-362ef5f6ced862daa4733034810d0b07e2ad5d89.tar.gz minetest-362ef5f6ced862daa4733034810d0b07e2ad5d89.tar.bz2 minetest-362ef5f6ced862daa4733034810d0b07e2ad5d89.zip |
Make sure we get a stacktrace for as many lua errors as possible
Diffstat (limited to 'src/script/common')
-rw-r--r-- | src/script/common/c_content.cpp | 4 | ||||
-rw-r--r-- | src/script/common/c_internal.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 899e1c536..4730ca14d 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -654,7 +654,7 @@ ItemStack read_item(lua_State* L, int index,Server* srv) } else { - throw LuaError(NULL, "Expecting itemstack, itemstring, table or nil"); + throw LuaError(L, "Expecting itemstack, itemstring, table or nil"); } } @@ -941,7 +941,7 @@ std::vector<ItemStack> read_items(lua_State *L, int index, Server *srv) while (lua_next(L, index)) { s32 key = luaL_checkinteger(L, -2); if (key < 1) { - throw LuaError(NULL, "Invalid inventory list index"); + throw LuaError(L, "Invalid inventory list index"); } if (items.size() < (u32) key) { items.resize(key); diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp index 90846676f..b7dfb178c 100644 --- a/src/script/common/c_internal.cpp +++ b/src/script/common/c_internal.cpp @@ -71,7 +71,7 @@ void script_error(lua_State *L) { const char *s = lua_tostring(L, -1); std::string str(s ? s : ""); - throw LuaError(NULL, str); + throw LuaError(L, str); } // Push the list of callbacks (a lua table). |