1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00

Remove lua_State parameter from LuaError::LuaError

This commit is contained in:
ShadowNinja 2014-03-15 16:28:59 -04:00
parent f8b7555558
commit 31fe72dbac
13 changed files with 39 additions and 52 deletions

View file

@ -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);

View file

@ -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).

View file

@ -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[] =
{

View file

@ -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) {}
};