aboutsummaryrefslogtreecommitdiff
path: root/src/script/common
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2014-03-15 16:28:59 -0400
committerShadowNinja <shadowninja@minetest.net>2014-03-15 16:28:59 -0400
commit31fe72dbac3d53e8da21ef116ccf99febbc5196e (patch)
tree2a040621c7ee34a67a09f50e7fe19bf9b6c34c90 /src/script/common
parentf8b75555586e0e67d8320a804b9e077d29b96403 (diff)
downloadminetest-31fe72dbac3d53e8da21ef116ccf99febbc5196e.tar.gz
minetest-31fe72dbac3d53e8da21ef116ccf99febbc5196e.tar.bz2
minetest-31fe72dbac3d53e8da21ef116ccf99febbc5196e.zip
Remove lua_State parameter from LuaError::LuaError
Diffstat (limited to 'src/script/common')
-rw-r--r--src/script/common/c_content.cpp4
-rw-r--r--src/script/common/c_internal.cpp2
-rw-r--r--src/script/common/c_types.cpp7
-rw-r--r--src/script/common/c_types.h9
4 files changed, 4 insertions, 18 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
index 899e1c536..2898d28ae 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("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("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..4263dec90 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(str);
}
// Push the list of callbacks (a lua table).
diff --git a/src/script/common/c_types.cpp b/src/script/common/c_types.cpp
index 6ffad1cb1..e832ff2ab 100644
--- a/src/script/common/c_types.cpp
+++ b/src/script/common/c_types.cpp
@@ -23,13 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_internal.h"
#include "itemdef.h"
-LuaError::LuaError(lua_State *L, const std::string &s) :
- ServerError(s)
-{
- if (L) {
- m_s += '\n' + script_get_backtrace(L);
- }
-}
struct EnumString es_ItemType[] =
{
diff --git a/src/script/common/c_types.h b/src/script/common/c_types.h
index 709d4f34b..706470737 100644
--- a/src/script/common/c_types.h
+++ b/src/script/common/c_types.h
@@ -55,14 +55,7 @@ public:
class LuaError : public ServerError
{
public:
- LuaError(lua_State *L, const std::string &s);
-
- virtual ~LuaError() throw()
- {}
- virtual const char * what() const throw()
- {
- return m_s.c_str();
- }
+ LuaError(const std::string &s) : ServerError(s) {}
};