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

Small fix

Browse Source
This commit is contained in:
Federico Cecchetto 2022-03-29 23:59:07 +02:00
parent 2c14dc15e6
commit 9b2190cd4a
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,20 +32,20 @@ namespace notifies
{ {
if (vm_execute_hooks.find(pos) == vm_execute_hooks.end()) if (vm_execute_hooks.find(pos) == vm_execute_hooks.end())
{ {
hook_enabled = true;
return false; return false;
} }
if (!hook_enabled && pos > (char*)vm_execute_hooks.size()) if (!hook_enabled && pos > reinterpret_cast<char*>(vm_execute_hooks.size()))
{ {
hook_enabled = true; hook_enabled = true;
return false; return false;
} }
const auto hook = vm_execute_hooks[pos]; const auto& hook = vm_execute_hooks[pos];
const auto state = hook.lua_state(); const auto state = hook.lua_state();
const auto self_id = local_id_to_entity(game::scr_VmPub->function_frame->fs.localId); const scripting::entity self = local_id_to_entity(game::scr_VmPub->function_frame->fs.localId);
const auto self = scripting::entity(self_id);
std::vector<sol::lua_value> args; std::vector<sol::lua_value> args;
@ -59,16 +59,6 @@ namespace notifies
const auto result = hook(self, sol::as_args(args)); const auto result = hook(self, sol::as_args(args));
scripting::lua::handle_error(result); scripting::lua::handle_error(result);
const auto value = scripting::lua::convert({state, result});
const auto type = value.get_raw().type;
game::Scr_ClearOutParams();
if (result.valid() && type && type < game::SCRIPT_END)
{
scripting::push_value(value);
}
return true; return true;
} }
@ -99,7 +89,7 @@ namespace notifies
a.bind(replace); a.bind(replace);
a.popad64(); a.popad64();
a.mov(r14, (char*)empty_function); a.mov(r14, reinterpret_cast<char*>(empty_function));
a.jmp(end); a.jmp(end);
} }