Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Small change

Browse Source
This commit is contained in:
Federico Cecchetto 2022-03-11 22:07:16 +01:00
parent a0320455ae
commit 01874769b9
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/client/component/ui_scripting.cpp
View File

@ -48,10 +48,8 @@ namespace ui_scripting
{ {
return hksi_lual_error_hook.invoke<void>(s, formatted.data()); return hksi_lual_error_hook.invoke<void>(s, formatted.data());
} }
else
{ throw std::runtime_error(formatted);
throw std::runtime_error(formatted);
}
} }
int hksi_hks_error_stub(game::hks::lua_State* s, int a2) int hksi_hks_error_stub(game::hks::lua_State* s, int a2)
@ -60,31 +58,27 @@ namespace ui_scripting
{ {
return hksi_hks_error_hook.invoke<int>(s, a2); return hksi_hks_error_hook.invoke<int>(s, a2);
} }
else
{ throw std::runtime_error("unknown error");
throw std::runtime_error("unknown error");
}
} }
int lui_error_stub(game::hks::lua_State* s) void lui_error_stub(game::hks::lua_State* s)
{ {
if (!error_hook_enabled) if (!error_hook_enabled)
{ {
return lui_error_hook.invoke<int>(s); lui_error_hook.invoke<void>(s);
} }
else
const auto count = static_cast<int>(s->m_apistack.top - s->m_apistack.base);
const auto arguments = get_return_values(count);
std::string error_str = "LUI Error";
if (count && arguments[0].is<std::string>())
{ {
const auto count = static_cast<int>(s->m_apistack.top - s->m_apistack.base); error_str = arguments[0].as<std::string>();
const auto arguments = get_return_values(count);
std::string error_str = "LUI Error";
if (count && arguments[0].is<std::string>())
{
error_str = arguments[0].as<std::string>();
}
throw std::runtime_error(error_str);
} }
throw std::runtime_error(error_str);
} }
void* hks_start_stub(char a1) void* hks_start_stub(char a1)