ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Added Social Club check to hotkeys. (#2143)

Browse Source 
Removed IS_PAUSE_MENU_ACTIVE check from hotkeys to facilitate teleporting to waypoints.
This commit is contained in:
gir489 2023-09-18 17:14:30 -04:00 committed by GitHub
parent 5259d249f3
commit 5e177ef151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gta_pointers.hpp
View File

@ -335,6 +335,8 @@ namespace big
functions::decal_manager_remove m_decal_manager_remove; functions::decal_manager_remove m_decal_manager_remove;
PVOID m_decal_manager; PVOID m_decal_manager;
bool* m_is_social_club_overlay_active;
}; };
#pragma pack(pop) #pragma pack(pop)
static_assert(sizeof(gta_pointers) % 8 == 0, "Pointers are not properly aligned"); static_assert(sizeof(gta_pointers) % 8 == 0, "Pointers are not properly aligned");

9
src/pointers.cpp
View File

@ -1640,6 +1640,15 @@ namespace big
g_pointers->m_gta.m_decal_manager = ptr.add(3).rip().as<PVOID>(); g_pointers->m_gta.m_decal_manager = ptr.add(3).rip().as<PVOID>();
g_pointers->m_gta.m_decal_manager_remove = ptr.add(0xC).rip().as<functions::decal_manager_remove>(); g_pointers->m_gta.m_decal_manager_remove = ptr.add(0xC).rip().as<functions::decal_manager_remove>();
} }
},
// Is Social Club Overlay Active
{
"ISCOA",
"88 1D ? ? ? ? E8 ? ? ? ? 33 F6",
[](memory::handle ptr)
{
g_pointers->m_gta.m_is_social_club_overlay_active = ptr.add(2).rip().as<bool*>();
}
} }
>(); // don't leave a trailing comma at the end >(); // don't leave a trailing comma at the end

2
src/services/hotkey/hotkey_service.cpp
View File

@ -88,7 +88,7 @@ namespace big
if (g.cmd_executor.enabled) if (g.cmd_executor.enabled)
return; return;
if (g_gui->is_open() || HUD::IS_PAUSE_MENU_ACTIVE() || SCRIPT::GET_NUMBER_OF_THREADS_RUNNING_THE_SCRIPT_WITH_THIS_HASH(RAGE_JOAAT("cellphone_flashhand")) > 0 || HUD::IS_MP_TEXT_CHAT_TYPING()) if (g_gui->is_open() || *g_pointers->m_gta.m_is_social_club_overlay_active || SCRIPT::GET_NUMBER_OF_THREADS_RUNNING_THE_SCRIPT_WITH_THIS_HASH(RAGE_JOAAT("cellphone_flashhand")) > 0 || HUD::IS_MP_TEXT_CHAT_TYPING())
return; return;
if (state == eKeyState::RELEASE || state == eKeyState::DOWN) if (state == eKeyState::RELEASE || state == eKeyState::DOWN)