Fix non-unique patterns after a recent game update on Windows

danielkrupinski · Oct 4, 2024 · 78ffe41 · 78ffe41
1 parent 8754811
commit 78ffe41
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Source/CS2/Panorama/CUIEngine.h b/Source/CS2/Panorama/CUIEngine.h
@@ -13,7 +13,11 @@ struct CUIEngine {
 #endif
     using getPanelPointer = CUIPanel* (*)(CUIEngine* thisptr, const PanelHandle* handle);
     using runScript = void (*)(CUIEngine* thisptr, CUIPanel* contextPanel, const char* scriptSource, const char* originFile, std::uint64_t line);
-    using makeSymbol = CPanoramaSymbol (*)(CUIEngine* thisptr, int type, const char* text);
+#if IS_WIN64()
+    using makeSymbol = CPanoramaSymbol (*)(int type, const char* text);
+#elif IS_LINUX()
+    using makeSymbol = CPanoramaSymbol(*)(CUIEngine* thisptr, int type, const char* text);
+#endif
     using onDeletePanel = void (*)(CUIEngine* thisptr, PanelHandle* panelHandle);
 };
 

diff --git a/Source/GameClasses/PanoramaUiEngine.h b/Source/GameClasses/PanoramaUiEngine.h
@@ -50,7 +50,11 @@ class PanoramaUiEngine {
     [[nodiscard]] cs2::CPanoramaSymbol makeSymbol(int type, const char* text) noexcept
     {
         if (deps().makeSymbol && deps().thisptr)
+#if IS_WIN64()
+            return deps().makeSymbol(type, text);
+#elif IS_LINUX()
             return deps().makeSymbol(*deps().thisptr, type, text);
+#endif
         return -1;
     }
 

diff --git a/Source/MemoryPatterns/Windows/GameSceneNodePatternsWindows.h b/Source/MemoryPatterns/Windows/GameSceneNodePatternsWindows.h
@@ -14,7 +14,7 @@ struct GameSceneNodePatterns {
 
     [[nodiscard]] OffsetToGameSceneNodeOwner offsetToOwner() const noexcept
     {
-        return patternFinders.clientPatternFinder("39 B9 ? ? ? ? 75 ? 48 8B ? ?"_pat).add(11).template readOffset<OffsetToGameSceneNodeOwner>();
+        return patternFinders.clientPatternFinder("44 39 B9 ? ? ? ? 75 ? 48 8B ? ?"_pat).add(12).template readOffset<OffsetToGameSceneNodeOwner>();
     }
 
     [[nodiscard]] OffsetToChildGameSceneNode offsetToChild() const noexcept

diff --git a/Source/MemoryPatterns/Windows/PanoramaUiEnginePatternsWindows.h b/Source/MemoryPatterns/Windows/PanoramaUiEnginePatternsWindows.h
@@ -29,7 +29,7 @@ struct PanoramaUiEnginePatterns {
 
     [[nodiscard]] cs2::CUIEngine::makeSymbol makeSymbol() const noexcept
     {
-        return patternFinders.panoramaPatternFinder("8B CA 49 8B D0"_pat).template as<cs2::CUIEngine::makeSymbol>();
+        return patternFinders.panoramaPatternFinder("C9 E8 ? ? ? ? 4C 63 2E"_pat).add(2).abs().template as<cs2::CUIEngine::makeSymbol>();
     }
 
     [[nodiscard]] cs2::CUIEngine::onDeletePanel onDeletePanel() const noexcept