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

Fix arguments/returns order

Browse Source
This commit is contained in:
Federico Cecchetto 2021-10-02 00:54:25 +02:00
parent cd79cd4d87
commit a921efb007
1 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/client/game/ui_scripting/execution.cpp
View File

@ -21,6 +21,23 @@ namespace ui_scripting
return state->m_apistack.top[-1 - offset]; return state->m_apistack.top[-1 - offset];
} }
arguments get_return_values(int count)
{
std::vector<value> values;
for (auto i = count - 1; i >= 0; i--)
{
values.push_back(get_return_value(i));
}
if (values.size() == 0)
{
values.push_back({});
}
return values;
}
arguments call_script_function(const function& function, const arguments& arguments) arguments call_script_function(const function& function, const arguments& arguments)
{ {
const auto state = *game::hks::lua_state; const auto state = *game::hks::lua_state;
@ -41,24 +58,8 @@ namespace ui_scripting
try try
{ {
game::hks::vm_call_internal(state, static_cast<int>(arguments.size()), -1, 0); game::hks::vm_call_internal(state, static_cast<int>(arguments.size()), -1, 0);
std::vector<value> values; const auto count = static_cast<int>(state->m_apistack.top - state->m_apistack.base);
return get_return_values(count);
const auto top = state->m_apistack.top;
const auto base = state->m_apistack.base;
const auto num = top - base;
for (auto i = 0; i < num; i++)
{
values.push_back(get_return_value(i));
}
if (values.size() == 0)
{
values.push_back({});
}
return values;
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -186,7 +187,7 @@ namespace ui_scripting
stack_isolation _; stack_isolation _;
push_value(self); push_value(self);
for (auto i = arguments.rbegin(); i != arguments.rend(); ++i) for (auto i = arguments.begin(); i != arguments.end(); ++i)
{ {
push_value(*i); push_value(*i);
} }
@ -200,19 +201,7 @@ namespace ui_scripting
try try
{ {
const auto count = function(*game::hks::lua_state); const auto count = function(*game::hks::lua_state);
std::vector<value> values; return get_return_values(count);
for (auto i = 0; i < count; i++)
{
values.push_back(get_return_value(i));
}
if (values.size() == 0)
{
values.push_back({});
}
return values;
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
@ -229,7 +218,7 @@ namespace ui_scripting
} }
stack_isolation _; stack_isolation _;
for (auto i = arguments.rbegin(); i != arguments.rend(); ++i) for (auto i = arguments.begin(); i != arguments.end(); ++i)
{ {
push_value(*i); push_value(*i);
} }
@ -243,19 +232,7 @@ namespace ui_scripting
try try
{ {
const auto count = function(*game::hks::lua_state); const auto count = function(*game::hks::lua_state);
std::vector<value> values; return get_return_values(count);
for (auto i = 0; i < count; i++)
{
values.push_back(get_return_value(i));
}
if (values.size() == 0)
{
values.push_back({});
}
return values;
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {