Do not require 'originFile' and 'line' parameters of PanoramaUiEngine…

…::runScript(). Add a comment explaining the default value of 'line'.
danielkrupinski · Jan 9, 2025 · 72efaa9 · 72efaa9
1 parent 9281744
commit 72efaa9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Source/Features/Hud/DefusingAlert/DefusingAlertContext.h b/Source/Features/Hud/DefusingAlert/DefusingAlertContext.h
@@ -87,8 +87,7 @@ class DefusingAlertContext {
     text: '5.0'
   });
 })();
-)"
-, "", 1);
+)");
 
         const auto defusingAlertContainer = hudTeamCounter.findChildInLayoutFile("DefusingAlertContainer");
         if (!defusingAlertContainer)

diff --git a/Source/GameClasses/PanoramaUiEngine.h b/Source/GameClasses/PanoramaUiEngine.h
@@ -15,10 +15,14 @@ class PanoramaUiEngine {
     {
     }
 
-    void runScript(cs2::CUIPanel* contextPanel, const char* scriptSource, const char* originFile, std::uint64_t line) noexcept
+    void runScript(cs2::CUIPanel* contextPanel, const char* scriptSource) noexcept
     {
+        // Game update on 3 October 2024 added panorama script caching (panorama_script_cache_enabled convar)
+        // By setting 'line' to non-zero value we disable caching so we don't have to specify different file path for different scripts
+        constexpr auto originFile{'\0'};
+        constexpr auto line{1};
         if (hookContext.panoramaPatternSearchResults().template get<RunScriptFunctionPointer>() && thisptr())
-            hookContext.panoramaPatternSearchResults().template get<RunScriptFunctionPointer>()(*thisptr(), contextPanel, scriptSource, originFile, line);
+            hookContext.panoramaPatternSearchResults().template get<RunScriptFunctionPointer>()(*thisptr(), contextPanel, scriptSource, &originFile, line);
     }
 
     [[nodiscard]] decltype(auto) getPanelFromHandle(cs2::PanelHandle handle) noexcept

diff --git a/Source/UI/Panorama/PanoramaGUI.h b/Source/UI/Panorama/PanoramaGUI.h
@@ -25,15 +25,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');", "", 1);
+        uiEngine().runScript(mainMenu, "if (!$('#JsSettings')) MainMenu.NavigateToTab('JsSettings', 'settings/settings');");
 
         const auto settings = mainMenu.findChildInLayoutFile("JsSettings");
         if (settings)
             state().settingsPanelHandle = settings.getHandle();
 
         uiEngine().runScript(settings, reinterpret_cast<const char*>(
 #include "CreateGUI.js"
-), "", 1);
+));
 
         uiEngine().runScript(mainMenu, R"(
 (function () {
@@ -52,7 +52,7 @@ class PanoramaGUI {
 
   $.DispatchEvent('Activated', $.GetContextPanel().FindChildTraverse("MainMenuNavBarHome"), 'mouse');
 })();
-)", "", 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", "", 1);
+            uiEngine.runScript(settingsPanel, "delete $.Osiris");
     }
 
 private: