more x64 fixes

rafradek · Jun 9, 2024 · c90df67 · c90df67
1 parent 84067b7
commit c90df67
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -40,7 +40,7 @@ jobs:
         cd alliedmodders
         git clone --recursive https://github.com/alliedmodders/sourcemod --depth 1 -b 1.11-dev
         git clone https://github.com/alliedmodders/hl2sdk --depth 1 -b sdk2013 hl2sdk-sdk2013
-        git clone https://github.com/rafradek/hl2sdk-tf2 --depth 1 hl2sdk-tf2
+        git clone https://github.com/rafradek/hl2sdk-tf2 --depth 1 -b tf2-fixcpudef hl2sdk-tf2
         git clone https://github.com/alliedmodders/hl2sdk --depth 1 -b css hl2sdk-css
         git clone https://github.com/alliedmodders/metamod-source --depth 1 -b 1.11-dev
         popd

diff --git a/src/mem/detour.cpp b/src/mem/detour.cpp
@@ -15,7 +15,7 @@
 #include <regex>
 
 
-#if !(PLATFORM_64BITS)
+#if !(defined(__i386__) || defined(_M_IX86) || defined(__x86_64__) )
 #error Architecture must be IA32/64
 #endif
 

diff --git a/src/mod/perf/hltv_optimize.cpp b/src/mod/perf/hltv_optimize.cpp
@@ -90,8 +90,8 @@ namespace Mod::Perf::HLTV_Optimize
                     rtti_scast<CClientFrameManager *>(hltvserver)->RemoveOldestFrame();
                 }
                 //DevMsg("SendNow %d\n", gpGlobals->tickcount % tickcount == 0/*reinterpret_cast<CGameClient *>(hltvclient)->ShouldSendMessages()*/);
-                //if (gpGlobals->tickcount % tickcount != 0)
-                //    return;
+                if (gpGlobals->tickcount % tickcount != 0)
+                    return;
             }
         }
 

diff --git a/src/mod/perf/virtual_call_optimize.cpp b/src/mod/perf/virtual_call_optimize.cpp
@@ -234,7 +234,7 @@ namespace Mod::Perf::Virtual_Call_Optimize
 		virtual bool GetPatchInfo(ByteBuf& buf, ByteBuf& mask) const override
 		{
 #ifdef PLATFORM_64BITS
-            buf.SetDword(0xc, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
+            buf.SetQword(0xc, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #else
             buf.SetDword(0xe + 2, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #endif
@@ -246,7 +246,7 @@ namespace Mod::Perf::Virtual_Call_Optimize
 		virtual bool AdjustPatchInfo(ByteBuf& buf) const override
 		{
 #ifdef PLATFORM_64BITS
-            buf.SetDword(0xc, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
+            buf.SetQword(0xc, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #else
             buf.SetDword(0xe + 2, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #endif
@@ -316,7 +316,7 @@ namespace Mod::Perf::Virtual_Call_Optimize
 		virtual bool GetPatchInfo(ByteBuf& buf, ByteBuf& mask) const override
 		{
 #ifdef PLATFORM_64BITS
-            buf.SetDword(0x9, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
+            buf.SetQword(0x9, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #else
             buf.SetDword(0xb + 2, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #endif
@@ -328,7 +328,7 @@ namespace Mod::Perf::Virtual_Call_Optimize
 		virtual bool AdjustPatchInfo(ByteBuf& buf) const override
 		{
 #ifdef PLATFORM_64BITS
-            buf.SetDword(0x9, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
+            buf.SetQword(0x9, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #else
             buf.SetDword(0xb + 2, (uintptr_t)RTTI::GetVTable("11CStaticProp"));
 #endif