diff --git a/Solution/source/Memory/GTAmemory.cpp b/Solution/source/Memory/GTAmemory.cpp index 0e093337..1cc2eed3 100644 --- a/Solution/source/Memory/GTAmemory.cpp +++ b/Solution/source/Memory/GTAmemory.cpp @@ -1492,8 +1492,6 @@ void GTAmemory::Init() _gamePlayCameraAddr = reinterpret_cast(*reinterpret_cast(address + 3) + address + 7); } - - // Bypass model requests block if (g_isEnhanced) { address = MemryScan::PatternScanner::FindPattern("44 0f b6 b4 24 ? ? ? ? 41 20 f6"); @@ -1505,17 +1503,6 @@ void GTAmemory::Init() if (address) memset(reinterpret_cast(address - 24), 0x90, 24); } - // Bypass is player model allowed to spawn checks - if (g_isEnhanced) { - address = MemryScan::PatternScanner::FindPattern("74 ? e8 ? ? ? ? 48 8b b0"); - if (address) memset(reinterpret_cast(address + 28), 0x90, 6); - } - else { - // new pattern that lands outside of the patched bytes, to ensure compatibility with other mods that patch them. - address = MemryScan::PatternScanner::FindPattern("40 53 48 83 ec ? e8 ? ? ? ? 48 8b d8 48 85 c0 74 ? 48 8b 10 48 8b c8 ff 52"); - if (address) memset(reinterpret_cast(address + 28), 0x90, 4); - } - //GetModelInfo if (g_isEnhanced) { diff --git a/Solution/source/Menyoo.rc b/Solution/source/Menyoo.rc index 2bf4b1d0..8b9e9ee6 100644 --- a/Solution/source/Menyoo.rc +++ b/Solution/source/Menyoo.rc @@ -121,4 +121,9 @@ END FX_ASI_BUILD 3586 BEGIN "\0" -END \ No newline at end of file +END + +FX_ASI_BUILD 3717 +BEGIN +"\0" +END diff --git a/Solution/source/_Build/bin/Release/menyooStuff/PedList.xml b/Solution/source/_Build/bin/Release/menyooStuff/PedList.xml index de9e6e2d..7cc894da 100644 --- a/Solution/source/_Build/bin/Release/menyooStuff/PedList.xml +++ b/Solution/source/_Build/bin/Release/menyooStuff/PedList.xml @@ -2,6 +2,7 @@ + diff --git a/Solution/source/macros.h b/Solution/source/macros.h index eda49a8a..4fe389b4 100644 --- a/Solution/source/macros.h +++ b/Solution/source/macros.h @@ -16,7 +16,7 @@ #define _CRT_SECURE_NO_WARNINGS -#define MENYOO_CURRENT_VER_ "2.2.0" +#define MENYOO_CURRENT_VER_ "2.2.1" #define GAME_PLAYERCOUNT 30 diff --git a/Solution/source/main.h b/Solution/source/main.h index 42ea83d3..f2d9fc2e 100644 --- a/Solution/source/main.h +++ b/Solution/source/main.h @@ -293,6 +293,8 @@ enum eGameVersion : int VER_1_0_3586_0, + VER_1_0_3717_0, + VER_1_0_811_8 = 1001, VER_1_0_812_8 = 1002, @@ -304,6 +306,8 @@ enum eGameVersion : int VER_1_0_889_15 = 1005, VER_1_0_889_19 = 1006, + + VER_1_0_1013_17 = 1007, VER_SIZE, VER_UNK = -1