Merge pull request #53 from Tim4ukys/beta

update to v13.0.0
Tim4ukys · Jun 16, 2024 · 28e5080 · 28e5080
2 parents 8ab2907 + 6f8159e
commit 28e5080
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 22 deletions.
diff --git a/news.json b/news.json
@@ -54,5 +54,8 @@
   ],
   "12.0.0": [
 	"Адаптировал плагин под новую версию gtarp_clientside.asi"
+  ],
+  "13.0.0": [
+	"Адаптировал плагин под новую версию gtarp_clientside.asi"
   ]
 }
diff --git a/patchGTARPClient/Updater.h b/patchGTARPClient/Updater.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #ifndef CURRENT_VERSION
-#define CURRENT_VERSION "12.0.0"
+#define CURRENT_VERSION "13.0.0"
 #endif
 
 class Updater {

diff --git a/patchGTARPClient/dllmain.cpp b/patchGTARPClient/dllmain.cpp
@@ -15,7 +15,7 @@
 #include "Updater.h"
 
 const char SAMP_CMP[] = "E86D9A0A0083C41C85C0";
-constexpr DWORD GTARP_TIMESTAMP = 0x644FD347;
+constexpr DWORD GTARP_TIMESTAMP = 0x660E8E4C;
 
 #define GITHUB_URL      "github.com/Tim4ukys/patchGTARPClient"
 
@@ -160,7 +160,7 @@ NOINLINE void   gameLoopDetourFNC() {
             g_pSAMP->addChatMessage(0x99'00'00, "[{FF9900}patchGTARPClient{990000}] {FF9900}Сайт: {990000}" GITHUB_URL "{FF9900}!");
         }
         g_pSAMP->addChatMessage(0x99'00'00, "[{FF9900}patchGTARPClient{990000}] {FF9900}Все самые свежие новости об обновлениях в нашем tg канале!");
-        g_pSAMP->addChatMessage(0x99'00'00, "[{FF9900}patchGTARPClient{990000}] {FF9900}Ссылка: {990000}https://t.me/+LVGCHEsDZEhmY2My");
+        g_pSAMP->addChatMessage(0x99'00'00, "[{FF9900}patchGTARPClient{990000}] {FF9900}Ссылка: {990000}https://t.me/gaZmanoV_m0ds");
         s_bIsInit = true;
     }
 }

diff --git a/patchGTARPClient/offsets.hpp b/patchGTARPClient/offsets.hpp
@@ -19,21 +19,21 @@ class OFFSETS {
     */
     enum class GTARP : unsigned int {
         /* Sig: 83 F8 FF 75 14 6A 00 FF 15 ? ? ? ? 50 FF 15 ? ? ? ? E9 ? ? ? ? */
-        LOCKCONNECTTOOTHERSERVER = 0x5119, // +
+        LOCKCONNECTTOOTHERSERVER = 0x4F0D, 
         /* Sig(offs: -1h): A3 ? ? ? ? B9 ? ? ? ? 8B C4 C7 00 ? ? ? ? E8 ? ? ? ? 51 89 45 94  */
-        INITTEXTURE_INITHOOK = 0x1C087,
+        INITTEXTURE_INITHOOK = 0x1BE57,
         /* Sig: 55 8B EC 83 EC 70 */
-        INITTEXTURE_FNC = 0x1BA60,
+        INITTEXTURE_FNC = 0x1B830,
 
         /* [can be found in] Sig: 8B 04 B5 ? ? ? ? 8B 0D ? ? ? ? FF 30 8B 41 20 6A 01 FF D0 8B 0D ? ? ? ? */
         ARRAYSERVERLOGO = 0xDADBC, /* 01 - +0h, 02 - +4h, test - +8h*/
         /* Sig(offs: +6h): 0F 82 ? ? ? ? A1 ? ? ? ? */
         SERVERID = 0xCFB20, // 2 - test server
 
         /* Sig: 55 8B EC 83 EC 48 A1 ? ? ? ? 33 C5 89 45 FC 56 */
-        DRAWHUD = 0x1C450,
+        DRAWHUD = 0x1C230,
         /* Sig: 85 C0 75 1F C7 05 ? ? ? ? ? ? ? ? */
-        DRAWSPEEDOMETER_DRAWRAMKA = 0x2597A,
+        DRAWSPEEDOMETER_DRAWRAMKA = 0x2576A,
 
         /* [can be found in] Sig: 8B 0D ? ? ? ? 83 C4 08 85 C9 */
         WANTEDLEVEL = 0xDAB70,
@@ -42,22 +42,22 @@ class OFFSETS {
         //DISABLECHECKTXD = 0xF134, goodbay epta
 
         /* Sig(offs: +5h): A3 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? 51 */
-        DISABLE_CALL_SET_CUSTOM_RADAR = 0xF386,
+        DISABLE_CALL_SET_CUSTOM_RADAR = 0xF176,
         /* Sig: FF D7 83 C4 10 8B D8 */
-        CUSTOM_PATH_TXD_HUD = 0x2E899, // ?
+        CUSTOM_PATH_TXD_HUD = 0x2E6D8, // ?
 
         /* Sig: 85 C0 0F 95 45 F4 88 1E */
-        DISABLE_RECHANGE_SCALE_STATE = 0x2EE69,
+        DISABLE_RECHANGE_SCALE_STATE = 0x2EBF9,
 
         /* Gde-to ryadom s "wh" or "strobe" */
-        CONSCREEN_POS_X = 0x202AB + 2,
-        CONSCREEN_POS_Y = 0x20328 + 2,
-        CONSCREEN_POS_Z = 0x203A5 + 2,
-        CONSCREEN_POINT_X = 0x20422 + 2,
-        CONSCREEN_POINT_Y = 0x2049F + 2,
-        CONSCREEN_POINT_Z = 0x2051C + 2,
-
-        CONSCREEN_TIME = 0x1FAA3 + 2
+        CONSCREEN_POS_X = 0x2009B + 2,
+        CONSCREEN_POS_Y = 0x20118 + 2,
+        CONSCREEN_POS_Z = 0x20195 + 2,
+        CONSCREEN_POINT_X = 0x20212 + 2,
+        CONSCREEN_POINT_Y = 0x2028F + 2,
+        CONSCREEN_POINT_Z = 0x2030C + 2,
+
+        CONSCREEN_TIME = 0x1F893 + 2
     };
 
     enum class SAMP : unsigned int {

diff --git a/patchGTARPClient/patchGTARPClient.vcxproj b/patchGTARPClient/patchGTARPClient.vcxproj
@@ -49,15 +49,15 @@
     <IncludePath>$(DXSDK_DIR)Include;$(SolutionDir)third-party\PolyHook_2_0\out\install\x86-$(Configuration)\include;$(BOOST_ROOT);$(IncludePath)</IncludePath>
     <LibraryPath>$(DXSDK_DIR)Lib\x86;$(SolutionDir)third-party\PolyHook_2_0\out\install\x86-$(Configuration)\lib;$(LibraryPath)</LibraryPath>
     <TargetName>!000patchGTARPClientByTim4ukys</TargetName>
-    <OutDir>D:\Games\GTA RP\</OutDir>
+    <OutDir>D:\Games\new gta rp\gtarp_crmp</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetExt>.ASI</TargetExt>
     <IncludePath>$(DXSDK_DIR)Include;$(SolutionDir)third-party\PolyHook_2_0\out\install\x86-$(Configuration)\include;$(BOOST_ROOT);$(IncludePath)</IncludePath>
     <LibraryPath>$(DXSDK_DIR)Lib\x86;$(SolutionDir)third-party\PolyHook_2_0\out\install\x86-$(Configuration)\lib;$(LibraryPath)</LibraryPath>
     <TargetName>!000patchGTARPClientByTim4ukys</TargetName>
-    <OutDir>D:\Games\GTA RP\</OutDir>
+    <OutDir>D:\Games\new gta rp\gtarp_crmp</OutDir>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg">
     <VcpkgEnabled>false</VcpkgEnabled>

diff --git a/update.json b/update.json
@@ -1,3 +1,3 @@
 {
-    "vers": "12.0.0"
+    "vers": "13.0.0"
 }