From f8b75555586e0e67d8320a804b9e077d29b96403 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sat, 15 Mar 2014 16:01:06 -0400 Subject: 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. --- src/script/common/c_content.cpp | 4 ++-- src/script/common/c_internal.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/script/common') diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 4730ca14d..899e1c536 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(L, "Expecting itemstack, itemstring, table or nil"); + throw LuaError(NULL, "Expecting itemstack, itemstring, table or nil"); } } @@ -941,7 +941,7 @@ std::vector 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(L, "Invalid inventory list index"); + throw LuaError(NULL, "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 b7dfb178c..90846676f 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(L, str); + throw LuaError(NULL, str); } // Push the list of callbacks (a lua table). -- cgit v1.2.3