ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2024-12-22 20:17:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed hooks::scripted_game_event using incorrect types and sizes. (#2844)

Browse Source
This commit is contained in:
gir489 2024-03-19 05:33:50 -04:00 committed by GitHub
parent 1dc46b1fa9
commit 0bf069ad99
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hooks/protections/script_event_handler.cpp
View File

@ -59,7 +59,8 @@ namespace big
bool hooks::scripted_game_event(CScriptedGameEvent* scripted_game_event, CNetGamePlayer* player) bool hooks::scripted_game_event(CScriptedGameEvent* scripted_game_event, CNetGamePlayer* player)
{ {
const auto args = scripted_game_event->m_args; const auto args = scripted_game_event->m_args;
const auto args_count = scripted_game_event->m_args_size / 8;
const auto hash = static_cast<eRemoteEvent>(args[0]); const auto hash = static_cast<eRemoteEvent>(args[0]);
const auto player_name = player->get_name(); const auto player_name = player->get_name();
@ -70,8 +71,8 @@ namespace big
{ {
std::vector<int32_t> script_event_args; std::vector<int32_t> script_event_args;
script_event_args.reserve(scripted_game_event->m_args_size); script_event_args.reserve(args_count);
for (int i = 0; i < scripted_game_event->m_args_size; i++) for (int i = 0; i < args_count; i++)
script_event_args.push_back(args[i]); script_event_args.push_back(args[i]);
auto event_ret = g_lua_manager->trigger_event<menu_event::ScriptedGameEventReceived, bool>((int)player->m_player_id, script_event_args); auto event_ret = g_lua_manager->trigger_event<menu_event::ScriptedGameEventReceived, bool>((int)player->m_player_id, script_event_args);
@ -432,7 +433,7 @@ namespace big
&& (!g.debug.logs.script_event.filter_player || g.debug.logs.script_event.player_id == player->m_player_id)) && (!g.debug.logs.script_event.filter_player || g.debug.logs.script_event.player_id == player->m_player_id))
{ {
std::string script_args = "{ "; std::string script_args = "{ ";
for (std::size_t i = 0; i < scripted_game_event->m_args_size; i++) for (int i = 0; i < args_count; i++)
{ {
if (i) if (i)
script_args += ", "; script_args += ", ";