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

Only push the Lua error handler once

Browse source
This commit is contained in:
ShadowNinja 2014-04-15 13:30:46 -04:00
parent 1838a3fd69
commit db4ea4658c
9 changed files with 154 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/script/cpp_api/s_mainmenu.cpp
View file

@ -37,14 +37,11 @@ void ScriptApiMainMenu::handleMainMenuEvent(std::string text)
{
SCRIPTAPI_PRECHECKHEADER
lua_pushcfunction(L, script_error_handler);
int errorhandler = lua_gettop(L);
// Get handler function
lua_getglobal(L, "engine");
lua_getfield(L, -1, "event_handler");
lua_remove(L, -2); // Remove engine
if(lua_isnil(L, -1)) {
if (lua_isnil(L, -1)) {
lua_pop(L, 1); // Pop event_handler
return;
}
@ -52,41 +49,37 @@ void ScriptApiMainMenu::handleMainMenuEvent(std::string text)
// Call it
lua_pushstring(L, text.c_str());
if(lua_pcall(L, 1, 0, errorhandler))
if (lua_pcall(L, 1, 0, m_errorhandler))
scriptError();
lua_pop(L, 1); // Pop error handler
}
void ScriptApiMainMenu::handleMainMenuButtons(std::map<std::string, std::string> fields)
{
SCRIPTAPI_PRECHECKHEADER
lua_pushcfunction(L, script_error_handler);
int errorhandler = lua_gettop(L);
// Get handler function
lua_getglobal(L, "engine");
lua_getfield(L, -1, "button_handler");
lua_remove(L, -2); // Remove engine
if(lua_isnil(L, -1)) {
if (lua_isnil(L, -1)) {
lua_pop(L, 1); // Pop button handler
return;
}
luaL_checktype(L, -1, LUA_TFUNCTION);
// Convert fields to lua table
// Convert fields to a Lua table
lua_newtable(L);
for(std::map<std::string, std::string>::const_iterator
i = fields.begin(); i != fields.end(); i++){
const std::string &name = i->first;
const std::string &value = i->second;
std::map<std::string, std::string>::const_iterator it;
for (it = fields.begin(); it != fields.end(); it++){
const std::string &name = it->first;
const std::string &value = it->second;
lua_pushstring(L, name.c_str());
lua_pushlstring(L, value.c_str(), value.size());
lua_settable(L, -3);
}
// Call it
if(lua_pcall(L, 1, 0, errorhandler))
if (lua_pcall(L, 1, 0, m_errorhandler))
scriptError();
lua_pop(L, 1); // Pop error handler
}