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

Add Lua errors to error dialog

Browse source
This commit is contained in:
rubenwardy 2015-03-02 18:26:20 +00:00 • committed by est31
parent 1455267c9e
commit 0d65ee878c
4 changed files with 60 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/script/cpp_api/s_base.cpp
View file

@ -119,14 +119,14 @@ ScriptApiBase::~ScriptApiBase()
}
bool ScriptApiBase::loadMod(const std::string &script_path,
const std::string &mod_name)
const std::string &mod_name, std::string *error)
{
ModNameStorer mod_name_storer(getStack(), mod_name);
return loadScript(script_path);
return loadScript(script_path, error);
}
bool ScriptApiBase::loadScript(const std::string &script_path)
bool ScriptApiBase::loadScript(const std::string &script_path, std::string *error)
{
verbosestream << "Loading and running script from " << script_path << std::endl;
@ -140,13 +140,14 @@ bool ScriptApiBase::loadScript(const std::string &script_path)
}
ok = ok && !lua_pcall(L, 0, 0, m_errorhandler);
if (!ok) {
errorstream << "========== ERROR FROM LUA ===========" << std::endl;
errorstream << "Failed to load and run script from " << std::endl;
errorstream << script_path << ":" << std::endl;
errorstream << std::endl;
errorstream << lua_tostring(L, -1) << std::endl;
errorstream << std::endl;
errorstream << "======= END OF ERROR FROM LUA ========" << std::endl;
std::string error_msg = lua_tostring(L, -1);
if (error)
(*error) = error_msg;
errorstream << "========== ERROR FROM LUA ===========" << std::endl
<< "Failed to load and run script from " << std::endl
<< script_path << ":" << std::endl << std::endl
<< error_msg << std::endl << std::endl
<< "======= END OF ERROR FROM LUA ========" << std::endl;
lua_pop(L, 1); // Pop error message from stack
return false;
}
@ -268,4 +269,3 @@ void ScriptApiBase::objectrefGet(lua_State *L, u16 id)
lua_remove(L, -2); // object_refs
lua_remove(L, -2); // core
}

4
src/script/cpp_api/s_base.h
View file

@ -51,8 +51,8 @@ public:
ScriptApiBase();
virtual ~ScriptApiBase();
bool loadMod(const std::string &script_path, const std::string &mod_name);
bool loadScript(const std::string &script_path);
bool loadMod(const std::string &script_path, const std::string &mod_name, std::string *error=NULL);
bool loadScript(const std::string &script_path, std::string *error=NULL);
/* object */
void addObjectReference(ServerActiveObject *cobj);