ModdingRX/TmpMenu
1
0
Fork 0
mirror of https://github.com/Mr-X-GTA/YimMenu.git synced 2025-06-18 15:17:23 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix(Hooking): Confusion between 2 different natives

Browse Source
This commit is contained in:
Yimura 2021-12-22 14:26:54 +01:00
parent d925ec2bbc
commit 8d6152bcd5
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BigBaseV2/src/hooking.cpp
View File

@ -54,7 +54,7 @@ namespace big
m_is_dlc_present_hook("IDP", g_pointers->m_is_dlc_present, &hooks::is_dlc_present), m_is_dlc_present_hook("IDP", g_pointers->m_is_dlc_present, &hooks::is_dlc_present),
// Error Screen // Error Screen
m_error_screen_hook("ES", g_pointers->m_error_screen, &hooks::set_warning_message_with_header_and_substring_flags), m_error_screen_hook("ES", g_pointers->m_error_screen, &hooks::set_warning_message_with_header),
// Received Event // Received Event
m_received_event_hook("RE", g_pointers->m_received_event, &hooks::received_event), m_received_event_hook("RE", g_pointers->m_received_event, &hooks::received_event),

19
BigBaseV2/src/hooking.hpp
View File

@ -23,18 +23,17 @@ namespace big
static LRESULT wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); static LRESULT wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
static BOOL set_cursor_pos(int x, int y); static BOOL set_cursor_pos(int x, int y);
static void set_warning_message_with_header_and_substring_flags( static void set_warning_message_with_header(
char* entryHeader, const char* entryHeader,
char* entryLine1, const char* entryLine1,
int instructionalKey, int instructionalKey,
char* entryLine2, const char* entryLine2,
BOOL p4, bool p4,
Any p5, Any p5,
Any* additionalIntInfo, Any* showBackground,
const char* additionalTextInfoLine1, Any* p7,
const char* additionalTextInfoLine2, bool p8,
BOOL background, Any p9
int errorCode
); );
static rage::eThreadState gta_thread_tick(GtaThread* a1, unsigned int a2); static rage::eThreadState gta_thread_tick(GtaThread* a1, unsigned int a2);

30
BigBaseV2/src/hooks/disable_error_screen.cpp
View File

@ -4,34 +4,32 @@
namespace big namespace big
{ {
void hooks::set_warning_message_with_header_and_substring_flags( void hooks::set_warning_message_with_header(
char* entryHeader, const char* entryHeader,
char* entryLine1, const char* entryLine1,
int instructionalKey, int instructionalKey,
char* entryLine2, const char* entryLine2,
BOOL p4, bool p4,
Any p5, Any p5,
Any* additionalIntInfo, Any* showBackground,
const char* additionalTextInfoLine1, Any* p7,
const char* additionalTextInfoLine2, bool p8,
BOOL background, Any p9
int errorCode
) )
{ {
if (SCRIPT::GET_HASH_OF_THIS_SCRIPT_NAME() == RAGE_JOAAT("shop_controller")) return; if (SCRIPT::GET_HASH_OF_THIS_SCRIPT_NAME() == RAGE_JOAAT("shop_controller")) return;
return g_hooking->m_error_screen_hook.get_original<decltype(&hooks::set_warning_message_with_header_and_substring_flags)>()( return g_hooking->m_error_screen_hook.get_original<decltype(&hooks::set_warning_message_with_header)>()(
entryHeader, entryHeader,
entryLine1, entryLine1,
instructionalKey, instructionalKey,
entryLine2, entryLine2,
p4, p4,
p5, p5,
additionalIntInfo, showBackground,
additionalTextInfoLine1, p7,
additionalTextInfoLine2, p8,
background, p9
errorCode
); );
} }
} }