XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Merge pull request #323 from fedddddd/lui-scripting-fix

Browse Source 
LUI scripting fixes
This commit is contained in:
Maurice Heumann 2022-03-01 21:22:54 +01:00 committed by GitHub
commit c7c66f6ec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,12 +26,14 @@ namespace ui_scripting
utils::hook::detour hksi_lual_error_hook2;
utils::hook::detour hks_start_hook;
utils::hook::detour hks_shutdown_hook;
utils::hook::detour hks_allocator_hook;
utils::hook::detour hks_frame_hook;
bool error_hook_enabled = false;
void hksi_lual_error_stub(game::hks::lua_State* s, const char* fmt, ...)
{
char va_buffer[0x200] = { 0 };
char va_buffer[2048] = {0};
va_list ap;
va_start(ap, fmt);
@ -52,7 +54,7 @@ namespace ui_scripting
void* hks_start_stub(char a1)
{
const auto _ = gsl::finally([]()
const auto _1 = gsl::finally([]()
{
ui_scripting::lua::engine::start();
});
@ -65,6 +67,26 @@ namespace ui_scripting
ui_scripting::lua::engine::stop();
hks_shutdown_hook.invoke<void*>();
}
void* hks_allocator_stub(void* userData, void* oldMemory, unsigned __int64 oldSize, unsigned __int64 newSize)
{
const auto closure = reinterpret_cast<game::hks::cclosure*>(oldMemory);
if (converted_functions.find(closure) != converted_functions.end())
{
converted_functions.erase(closure);
}
return hks_allocator_hook.invoke<void*>(userData, oldMemory, oldSize, newSize);
}
void hks_frame_stub()
{
const auto state = *game::hks::lua_state;
if (state)
{
ui_scripting::lua::engine::run_frame();
}
}
}
int main_function_handler(game::hks::lua_State* state)
@ -135,29 +157,18 @@ namespace ui_scripting
return;
}
scheduler::loop([]()
{
if (game::Sys_IsMainThread())
{
ui_scripting::lua::engine::run_frame();
}
}, scheduler::pipeline::renderer);
hks_start_hook.create(0x1400E4E40, hks_start_stub);
hks_shutdown_hook.create(0x1400DB9A0, hks_shutdown_stub);
hksi_lual_error_hook.create(0x1400A03D0, hksi_lual_error_stub);
hksi_lual_error_hook2.create(0x1400A77D0, hksi_lual_error_stub);
hks_allocator_hook.create(0x14009C860, hks_allocator_stub);
hks_frame_hook.create(0x1400E3910, hks_frame_stub);
command::add("lui_restart", []()
{
utils::hook::invoke<void>(0x1400DB9A0);
utils::hook::invoke<void>(0x1400E6730);
});
command::add("reloaduiscripts", []()
{
scheduler::once(ui_scripting::lua::engine::start, scheduler::pipeline::renderer);
});
}
};
}