aboutsummaryrefslogtreecommitdiff
path: root/src/script/common
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2014-03-15 16:01:06 -0400
committerShadowNinja <shadowninja@minetest.net>2014-03-15 16:01:06 -0400
commitf8b75555586e0e67d8320a804b9e077d29b96403 (patch)
treef992793df77298fab89185848d81ebe5f05da3a6 /src/script/common
parent23be6450a115954b281c045aefacbefba6837b6f (diff)
downloadminetest-f8b75555586e0e67d8320a804b9e077d29b96403.tar.gz
minetest-f8b75555586e0e67d8320a804b9e077d29b96403.tar.bz2
minetest-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/common')
-rw-r--r--src/script/common/c_content.cpp4
-rw-r--r--src/script/common/c_internal.cpp2
2 files changed, 3 insertions, 3 deletions
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<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(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).