From 30ab74a4f097f2c075b346533fc72efa40dda2e0 Mon Sep 17 00:00:00 2001
From: Dusk-92 <romain.thomas92@proton.me>
Date: Thu, 3 Sep 2026 23:04:40 +0200
Subject: [PATCH] Normalize SuperWoW-managed executable patches

---
 setup_tool.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/setup_tool.py b/setup_tool.py
index d1748c0..f53281f 100644
--- a/setup_tool.py
+++ b/setup_tool.py
@@ -2540,6 +2540,42 @@ WScript.Echo oWS.SpecialFolders("Desktop")
             signature["superwow_managed_patch_reset"] = 1
         return signature
 
+    def _reset_superwow_managed_exe_patches(self, path):
+        """Undo inherited vanilla-tweaks patches that SuperWoW/SuperAPI own."""
+        with open(path, "rb") as handle:
+            data = bytearray(handle.read())
+
+        required_size = 0x435D3C
+        if len(data) < required_size:
+            raise RuntimeError("WoW executable is too small to normalize SuperWoW-managed patches.")
+
+        for offset in (0x0C1ECF, 0x0C2B25):
+            if data[offset] not in (0x74, 0x75):
+                raise RuntimeError(
+                    f"Unexpected QuickLoot opcode at 0x{offset:X}; refusing to alter an unknown client."
+                )
+            data[offset] = 0x74
+
+        if data[0x3A4869] not in (0x14, 0x27):
+            raise RuntimeError(
+                "Unexpected Background Sound byte; refusing to alter an unknown client."
+            )
+        data[0x3A4869] = 0x14
+        data[0x4089B4:0x4089B8] = struct.pack("<f", 1.5708)
+        data[0x435D38:0x435D3C] = b"12\x00\x00"
+
+        staged = path + ".superwow-reset"
+        try:
+            with open(staged, "wb") as handle:
+                handle.write(data)
+            os.replace(staged, path)
+        finally:
+            if os.path.exists(staged):
+                try:
+                    os.remove(staged)
+                except OSError:
+                    pass
+
     def run_vanilla_tweaks(self, target, tweaks_exe=None, modern_cli=False):
         """Patch a copy of WoW.exe while preserving the original executable."""
         wow_exe = os.path.join(target, "WoW.exe")
@@ -2665,6 +2701,9 @@ WScript.Echo oWS.SpecialFolders("Desktop")
         try:
             subprocess.run(args, check=True)
 
+            if superwow_active:
+                self._reset_superwow_managed_exe_patches(staged_output)
+
             valid_pe, reason = self._inspect_wow_executable(staged_output)
             if not valid_pe:
                 raise RuntimeError(