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

Fix gsc hooks

Browse Source
This commit is contained in:
fed 2023-06-01 20:43:21 +02:00
parent 088b544691
commit 9ea691933b
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/client/component/notifies.cpp
View File

@ -20,8 +20,9 @@ namespace notifies
struct gsc_hook_t struct gsc_hook_t
{ {
bool is_lua_hook{}; bool is_lua_hook{};
const char* target_pos{};
bool is_variable{}; bool is_variable{};
const char* target_pos{};
size_t rel_source_pos{};
sol::protected_function lua_function; sol::protected_function lua_function;
}; };
@ -57,11 +58,11 @@ namespace notifies
const auto rel_offset = pos - program_buffer; const auto rel_offset = pos - program_buffer;
if (!gsc_hooks_buffer[rel_offset]) if (!gsc_hooks_buffer[rel_offset])
{ {
hook_enabled = true;
return false; return false;
} }
} }
const auto start = std::chrono::high_resolution_clock::now();
const auto iter = vm_execute_hooks.find(pos); const auto iter = vm_execute_hooks.find(pos);
if (iter == vm_execute_hooks.end() || (!hook_enabled && !iter->second.is_variable)) if (iter == vm_execute_hooks.end() || (!hook_enabled && !iter->second.is_variable))
{ {
@ -204,9 +205,14 @@ namespace notifies
} }
void set_hook(const char* pos, gsc_hook_t& hook) void set_hook(const char* pos, gsc_hook_t& hook)
{
if (!hook.is_variable)
{ {
const auto rel_pos = get_program_buffer_offset(pos); const auto rel_pos = get_program_buffer_offset(pos);
gsc_hooks_buffer[rel_pos] = true; gsc_hooks_buffer[rel_pos] = true;
hook.rel_source_pos = rel_pos;
}
vm_execute_hooks[pos] = hook; vm_execute_hooks[pos] = hook;
} }
} }
@ -222,6 +228,11 @@ namespace notifies
{ {
if (i->second.is_lua_hook) if (i->second.is_lua_hook)
{ {
if (!i->second.is_variable)
{
gsc_hooks_buffer[i->second.rel_source_pos] = false;
}
i = vm_execute_hooks.erase(i); i = vm_execute_hooks.erase(i);
} }
else else
@ -235,7 +246,7 @@ namespace notifies
void set_lua_hook(const char* pos, const sol::protected_function& callback, bool is_variable) void set_lua_hook(const char* pos, const sol::protected_function& callback, bool is_variable)
{ {
gsc_hook_t hook; gsc_hook_t hook{};
hook.is_lua_hook = true; hook.is_lua_hook = true;
hook.is_variable = is_variable; hook.is_variable = is_variable;
hook.lua_function = callback; hook.lua_function = callback;
@ -244,7 +255,7 @@ namespace notifies
void set_gsc_hook(const char* source, const char* target) void set_gsc_hook(const char* source, const char* target)
{ {
gsc_hook_t hook; gsc_hook_t hook{};
hook.is_lua_hook = false; hook.is_lua_hook = false;
hook.target_pos = target; hook.target_pos = target;
set_hook(source, hook); set_hook(source, hook);

1
src/client/component/scripting.cpp
View File

@ -174,7 +174,6 @@ namespace scripting
void add_function_sort(unsigned int id, const char* pos) void add_function_sort(unsigned int id, const char* pos)
{ {
std::string filename = current_file; std::string filename = current_file;
if (current_file_id) if (current_file_id)
{ {