Fix for the latest game update on Windows

danielkrupinski · Oct 3, 2024 · 1c36359 · 1c36359
1 parent b6d5f1a
commit 1c36359
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 17 deletions.
diff --git a/Source/Features/Hud/DefusingAlert/DefusingAlertContext.h b/Source/Features/Hud/DefusingAlert/DefusingAlertContext.h
@@ -89,7 +89,7 @@ class DefusingAlertContext {
  });
 })();
 )"
-, "", 0);
+, "", 1);
 
  const auto defusingAlertContainer = hudTeamCounter.findChildInLayoutFile("DefusingAlertContainer");
  if (!defusingAlertContainer)

diff --git a/Source/GameClasses/PanoramaUiPanelContext.h b/Source/GameClasses/PanoramaUiPanelContext.h
@@ -37,7 +37,7 @@ struct PanoramaUiPanelContext {
  {
  if (const auto style = getStyle()) {
  // FIXME: hardcoded virtual method index
- reinterpret_cast<void(*)(cs2::CPanelStyle* thisptr, const cs2::Color* color)>((*reinterpret_cast<void(***)()>(style))[54])(style, &color);
+ reinterpret_cast<void(*)(cs2::CPanelStyle* thisptr, const cs2::Color* color)>((*reinterpret_cast<void(***)()>(style))[55])(style, &color);
  }
  }
 

diff --git a/Source/MemoryPatterns/Windows/ClientPatternsWindows.h b/Source/MemoryPatterns/Windows/ClientPatternsWindows.h
@@ -29,7 +29,7 @@ struct ClientPatterns {
 
  [[nodiscard]] cs2::CLoopModeGame** loopModeGame() const noexcept
  {
- return patternFinders.clientPatternFinder("48 89 35 ? ? ? ? 49 8B 73"_pat).add(3).abs().template as<cs2::CLoopModeGame**>();
+ return patternFinders.clientPatternFinder("48 8B 0D ? ? ? ? 44 0F 28 ? 24"_pat).add(3).abs().template as<cs2::CLoopModeGame**>();
  }
 
  [[nodiscard]] cs2::GlobalVars** globalVars() const noexcept

diff --git a/Source/MemoryPatterns/Windows/EntityPatternsWindows.h b/Source/MemoryPatterns/Windows/EntityPatternsWindows.h
@@ -14,7 +14,7 @@ struct EntityPatterns {
 
  [[nodiscard]] OffsetToHealth offsetToHealth() const noexcept
  {
- return patternFinders.clientPatternFinder("83 B9 ? ? ? ? 00 48 8B D9 7E ? C7"_pat).add(2).template readOffset<OffsetToHealth>();
+ return patternFinders.clientPatternFinder("D9 ? ? C7 81 ? ? ? ? 00 00 00 00 48 8D 15"_pat).add(5).template readOffset<OffsetToHealth>();
  }
 
  [[nodiscard]] OffsetToLifeState offsetToLifeState() const noexcept
@@ -34,7 +34,7 @@ struct EntityPatterns {
 
  [[nodiscard]] OffsetToRenderComponent offsetToRenderComponent() const noexcept
  {
- return patternFinders.clientPatternFinder("8B ? ? ? ? ? 48 85 C0 74 ? 39 58 ? 7E"_pat).add(2).template readOffset<OffsetToRenderComponent>();
+ return patternFinders.clientPatternFinder("8B ? ? ? ? ? 48 85 C0 74 ? 39 ? ? 7E"_pat).add(2).template readOffset<OffsetToRenderComponent>();
  }
 
  [[nodiscard]] OffsetToOwnerEntity offsetToOwnerEntity() const noexcept

diff --git a/Source/MemoryPatterns/Windows/FileSystemPatternsWindows.h b/Source/MemoryPatterns/Windows/FileSystemPatternsWindows.h
@@ -9,11 +9,12 @@ struct FileSystemPatterns {
 
  [[nodiscard]] cs2::CBaseFileSystem** fileSystem() const noexcept
  {
- return patternFinders.soundSystemPatternFinder("22 74 ? 48 8B 0D ? ? ? ? 4C 8D 44"_pat).add(6).abs().template as<cs2::CBaseFileSystem**>();
+ // todo: find better pattern (from filesystem dll?)
+ return patternFinders.soundSystemPatternFinder("48 8B 57 10 48 83 C2 28 39 ? 74 ? 48 8B 0D ? ? ? ? 4C 8D 44 24 ? 48 8B 01 FF 90 ? ? ? ? 8B 44 24"_pat).add(15).abs().template as<cs2::CBaseFileSystem**>();
  }
 
  [[nodiscard]] FileNamesOffset fileNamesOffset() const noexcept
  {
- return patternFinders.fileSystemPatternFinder("E8 ? ? ? ? 48 8D 8B ? ? ? ? FF 15"_pat).add(8).template readOffset<FileNamesOffset>();
+ return patternFinders.fileSystemPatternFinder("E8 ? ? ? ? 48 8D 8B ? ? ? ? FF 15 ? ? ? ? 8B"_pat).add(8).template readOffset<FileNamesOffset>();
  }
 };
diff --git a/Source/MemoryPatterns/Windows/PanoramaImagePanelPatternsWindows.h b/Source/MemoryPatterns/Windows/PanoramaImagePanelPatternsWindows.h
@@ -17,12 +17,12 @@ struct PanoramaImagePanelPatterns {
 
  [[nodiscard]] cs2::CImagePanel::Constructor* constructor() const noexcept
  {
- return patternFinders.clientPatternFinder("E8 ? ? ? ? 48 8B F0 45 33 ED"_pat).add(1).abs().template as<cs2::CImagePanel::Constructor*>();
+ return patternFinders.clientPatternFinder("E8 ? ? ? ? EB 03 48 8B ? BA"_pat).add(1).abs().template as<cs2::CImagePanel::Constructor*>();
  }
 
  [[nodiscard]] std::uint32_t* size() const noexcept
  {
- return patternFinders.clientPatternFinder("FF 90 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 4C 8B E8"_pat).add(7).template as<std::uint32_t*>();
+ return patternFinders.clientPatternFinder("01 FF 90 ? ? ? ? B9 ? ? ? ? E8 ? ? ? ? 48 85 C0 74 ? 48"_pat).add(8).template as<std::uint32_t*>();
  }
 
  [[nodiscard]] ImagePropertiesOffset imagePropertiesOffset() const noexcept

diff --git a/Source/MemoryPatterns/Windows/PanoramaUiEnginePatternsWindows.h b/Source/MemoryPatterns/Windows/PanoramaUiEnginePatternsWindows.h
@@ -24,7 +24,7 @@ struct PanoramaUiEnginePatterns {
 
  [[nodiscard]] cs2::CUIEngine::runScript runScript() const noexcept
  {
- return patternFinders.panoramaPatternFinder("48 89 5C 24 ? 48 89 6C 24 ? 56 57 41 54 41 56 41 57 48 81 EC ? ? ? ? 4C 8B"_pat).template as<cs2::CUIEngine::runScript>();
+ return patternFinders.panoramaPatternFinder("4C 89 4C 24 ? 4C 89 44 24 ? 48 89 54 24 ? 55"_pat).template as<cs2::CUIEngine::runScript>();
  }
 
  [[nodiscard]] cs2::CUIEngine::makeSymbol makeSymbol() const noexcept

diff --git a/Source/MemoryPatterns/Windows/PanoramaUiPanelPatternsWindows.h b/Source/MemoryPatterns/Windows/PanoramaUiPanelPatternsWindows.h
@@ -21,7 +21,7 @@ struct PanoramaUiPanelPatterns {
 
  [[nodiscard]] std::int32_t* getAttributeString() const noexcept
  {
- return patternFinders.clientPatternFinder("12 48 8B 01 FF 90 ? ? ? ? 48 8B D0 48 85 C0"_pat).add(6).template as<std::int32_t*>();
+ return patternFinders.clientPatternFinder("12 48 8B 01 FF 90 ? ? ? ? 48 8B ? 48 85 C0 74 ? 80 38 00 74 ? 48"_pat).add(6).template as<std::int32_t*>();
  }
 
  [[nodiscard]] std::int32_t* setAttributeString() const noexcept

diff --git a/Source/MemoryPatterns/Windows/PlantedC4PatternsWindows.h b/Source/MemoryPatterns/Windows/PlantedC4PatternsWindows.h
@@ -24,7 +24,7 @@ struct PlantedC4Patterns {
 
  [[nodiscard]] BombBlowTimeOffset m_flC4Blow() const noexcept
  {
- return patternFinders.clientPatternFinder("F3 0F 10 ? ? ? ? ? BB FF"_pat).add(4).template readOffset<BombBlowTimeOffset>();
+ return patternFinders.clientPatternFinder("F3 0F 10 ? ? ? ? ? BB FF FF"_pat).add(4).template readOffset<BombBlowTimeOffset>();
  }
 
  [[nodiscard]] BombDefuserOffset m_hBombDefuser() const noexcept

diff --git a/Source/MemoryPatterns/Windows/PlayerPawnPatternsWindows.h b/Source/MemoryPatterns/Windows/PlayerPawnPatternsWindows.h
@@ -39,6 +39,6 @@ struct PlayerPawnPatterns {
 
  [[nodiscard]] OffsetToFlashBangEndTime offsetToFlashBangEndTime() const noexcept
  {
- return patternFinders.clientPatternFinder("0F 2F 86 ? ? ? ? 48 8B 7C 24"_pat).add(3).template readOffset<OffsetToFlashBangEndTime>();
+ return patternFinders.clientPatternFinder("? ? ? ? 0F 2F 43 ? 0F 86 ? ? ? ? 48"_pat).template readOffset<OffsetToFlashBangEndTime>();
  }
 };
diff --git a/Source/UI/Panorama/PanoramaGUI.h b/Source/UI/Panorama/PanoramaGUI.h
@@ -22,15 +22,15 @@ class PanoramaGUI {
 
  // ensure settings tab is loaded because we use CSS classes from settings
  // TODO: replace use of settings CSS classes with raw style properties
- uiEngine().runScript(mainMenu, "if (!$('#JsSettings')) MainMenu.NavigateToTab('JsSettings', 'settings/settings');", "", 0);
+ uiEngine().runScript(mainMenu, "if (!$('#JsSettings')) MainMenu.NavigateToTab('JsSettings', 'settings/settings');", "", 1);
 
  const auto settings = mainMenu.findChildInLayoutFile("JsSettings");
  if (settings)
  state().settingsPanelHandle = settings.getHandle();
 
  uiEngine().runScript(settings, reinterpret_cast<const char*>(
 #include "CreateGUI.js"
-), "", 0);
+), "", 1);
 
  uiEngine().runScript(mainMenu, R"(
 (function () {
@@ -49,7 +49,7 @@ class PanoramaGUI {
 
  $.DispatchEvent('Activated', $.GetContextPanel().FindChildTraverse("MainMenuNavBarHome"), 'mouse');
 })();
-)", "", 0);
+)", "", 1);
 
  if (const auto guiButtonPanel = mainMenu.findChildInLayoutFile("OsirisOpenMenuButton"))
  state().guiButtonHandle = guiButtonPanel.getHandle();

diff --git a/Source/UI/Panorama/PanoramaGuiUnloadHandler.h b/Source/UI/Panorama/PanoramaGuiUnloadHandler.h
@@ -16,7 +16,7 @@ struct PanoramaGuiUnloadHandler {
  uiEngine.deletePanelByHandle(state().guiPanelHandle);
 
  if (auto&& settingsPanel = uiEngine.getPanelFromHandle(state().settingsPanelHandle))
- uiEngine.runScript(settingsPanel, "delete $.Osiris", "", 0);
+ uiEngine.runScript(settingsPanel, "delete $.Osiris", "", 1);
  }
 
 private: