Move prop count check mid-hook to earlier in function

On Windows this hook overrode instructions at the start of the block, which is a jump target for the extension. This made it jump to invalid binary since the real instructions were moved to the trampoline. There is a debug print block right before it, which functionally doesn't do anything for us, so we can hook there instead.

Author: chrb22

extension.cpp

@@ -1211,8 +1211,8 @@ void MidHook_SV_DetermineUpdateType_PackCheck(safetyhook::Context &registers)
 }
 
 // skip changed prop count check if there is a set edit
-safetyhook::MidHook g_MidHook_SV_DetermineUpdateType_PropCountCheck{};
-void MidHook_SV_DetermineUpdateType_PropCountCheck(safetyhook::Context &registers)
+safetyhook::MidHook g_MidHook_SV_DetermineUpdateType_VCRPrintCheck{};
+void MidHook_SV_DetermineUpdateType_VCRPrintCheck(safetyhook::Context &registers)
 {
     Context context(registers);
 
@@ -1548,17 +1548,17 @@ bool SendVarEdit::SDK_OnLoad(char* error, size_t maxlength, bool late)
         g_MidHook_SV_DetermineUpdateType_PackCheck = std::move(*midhook);
     }
 
-    // create a mid-hook at the SV_DetermineUpdateType positive propcount check that always passes the check if a set edit was made
+    // create a mid-hook at the SV_DetermineUpdateType VCR print check that always passes the positive propcount check if a set edit was made
     {
         void* address;
-        if (!gameconf->GetAddress("SV_DetermineUpdateType positive propcount check", &address))
-            RETURN_ERROR("Failed to find SV_DetermineUpdateType positive propcount check.");
+        if (!gameconf->GetAddress("SV_DetermineUpdateType VCR print check", &address))
+            RETURN_ERROR("Failed to find SV_DetermineUpdateType VCR print check.");
 
-        auto midhook = safetyhook::MidHook::create(address, MidHook_SV_DetermineUpdateType_PropCountCheck);
+        auto midhook = safetyhook::MidHook::create(address, MidHook_SV_DetermineUpdateType_VCRPrintCheck);
         if (!midhook.has_value())
-            RETURN_ERROR("Failed to mid-hook SV_DetermineUpdateType positive propcount check.");
+            RETURN_ERROR("Failed to mid-hook SV_DetermineUpdateType VCR print check.");
 
-        g_MidHook_SV_DetermineUpdateType_PropCountCheck = std::move(*midhook);
+        g_MidHook_SV_DetermineUpdateType_VCRPrintCheck = std::move(*midhook);
     }
 
     // create a mid-hook at the SendTable_WritePropList loop break condition that skips to the continuation point if an edit was made
@@ -1637,8 +1637,8 @@ void SendVarEdit::SDK_OnUnload()
     if (g_MidHook_SendTable_WritePropList_BreakCondition.enabled())
         g_MidHook_SendTable_WritePropList_BreakCondition = {};
 
-    if (g_MidHook_SV_DetermineUpdateType_PropCountCheck.enabled())
-        g_MidHook_SV_DetermineUpdateType_PropCountCheck = {};
+    if (g_MidHook_SV_DetermineUpdateType_VCRPrintCheck.enabled())
+        g_MidHook_SV_DetermineUpdateType_VCRPrintCheck = {};
 
     if (g_MidHook_SV_DetermineUpdateType_PackCheck.enabled())
         g_MidHook_SV_DetermineUpdateType_PackCheck = {};

gamedata/sendvaredit.txt

@@ -136,13 +136,13 @@
                 // 8B 4E ? 8D 85 ? ? ? ? 68 00 10 00 00
             }
 
-            "SV_DetermineUpdateType positive propcount check"
+            "SV_DetermineUpdateType VCR print check"
             {
                 "library"   "engine"
-                "linux"     "\x85\xF6\x7F\x2A\x80\xBB\x2A\x2A\x2A\x2A\x00"
-                // 85 F6 7F ? 80 BB ? ? ? ? 00
-                "windows"   "\x85\xFF\x7E\x2A\x6A\x00"
-                // 85 FF 7E ? 6A 00
+                "linux"     "\xA1\x2A\x2A\x2A\x2A\x8B\x40\x2A\x85\xC0\x74\x2A\x8D\x04\xB5\x2A\x2A\x2A\x2A"
+                // A1 ? ? ? ? 8B 40 ? 85 C0 74 ? 8D 04 B5 ? ? ? ?
+                "windows"   "\xA1\x2A\x2A\x2A\x2A\x83\x78\x2A\x00\x74\x2A\xA1\x2A\x2A\x2A\x2A\x8B\x08"
+                // A1 ? ? ? ? 83 78 ? 00 74 ? A1 ? ? ? ? 8B 08
             }
 
             "SV_DetermineUpdateType positive propcount block"
@@ -217,9 +217,9 @@
                 "signature" "SV_DetermineUpdateType props changed call"
             }
 
-            "SV_DetermineUpdateType positive propcount check"
+            "SV_DetermineUpdateType VCR print check"
             {
-                "signature" "SV_DetermineUpdateType positive propcount check"
+                "signature" "SV_DetermineUpdateType VCR print check"
             }
 
             "SV_DetermineUpdateType positive propcount block"