Fix #1750: Scenario index is not updated when in-game language changes (

#1751) * Update scenario index when in-game language is changed * ScenarioManager: name forceReload parameter; default to false
OpenLoco · Jan 12, 2023 · a26f820 · a26f820
1 parent 51e0ac5
commit a26f820
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 22.12+ (???)
 ------------------------------------------------------------------------
 - Feature: [#1745] Add cheat to instantly win any scenario/challenge.
+- Fix: [#1750] Scenario index is not updated when in-game language changes.
 
 22.12 (2022-12-22)
 ------------------------------------------------------------------------

diff --git a/src/OpenLoco/src/EditorController.cpp b/src/OpenLoco/src/EditorController.cpp
@@ -262,7 +262,7 @@ namespace OpenLoco::EditorController
                     break;
                 }
 
-                ScenarioManager::loadIndex(1);
+                ScenarioManager::loadIndex(true);
 
                 // This ends with a premature tick termination
                 Game::returnToTitle();

diff --git a/src/OpenLoco/src/OpenLoco.cpp b/src/OpenLoco/src/OpenLoco.cpp
@@ -284,7 +284,7 @@ namespace OpenLoco
         Ui::ProgressBar::setProgress(40);
         Ui::ProgressBar::end();
         ObjectManager::loadIndex();
-        ScenarioManager::loadIndex(0);
+        ScenarioManager::loadIndex();
         Ui::ProgressBar::begin(StringIds::loading);
         Ui::ProgressBar::setProgress(60);
         Gfx::loadG1();

diff --git a/src/OpenLoco/src/ScenarioManager.cpp b/src/OpenLoco/src/ScenarioManager.cpp
@@ -369,7 +369,7 @@ namespace OpenLoco::ScenarioManager
     }
 
     // 0x0044452F
-    void loadIndex(uint8_t al)
+    void loadIndex(const bool forceReload)
     {
         const auto oldFlags = getScreenFlags();
         setAllScreenFlags(ScreenFlags::title | oldFlags);
@@ -380,18 +380,11 @@ namespace OpenLoco::ScenarioManager
         }
 
         const auto currentState = getCurrentScenarioFolderState();
-
-        if (!tryLoadIndex(currentState))
+        if (forceReload || !tryLoadIndex(currentState))
         {
             createIndex(currentState);
         }
-        else
-        {
-            if (al != 0)
-            {
-                createIndex(currentState);
-            }
-        }
+
         setAllScreenFlags(oldFlags);
     }
 

diff --git a/src/OpenLoco/src/ScenarioManager.h b/src/OpenLoco/src/ScenarioManager.h
@@ -51,7 +51,7 @@ namespace OpenLoco::ScenarioManager
     bool hasScenarioInCategory(uint8_t category, ScenarioIndexEntry* scenario);
     uint16_t getScenarioCountByCategory(uint8_t category);
     ScenarioIndexEntry* getNthScenarioFromCategory(uint8_t category, uint8_t index);
-    void loadIndex(uint8_t al);
+    void loadIndex(const bool forceReload = false);
     void saveNewScore(Scenario::ObjectiveProgress& progress, const CompanyId companyId);
 
     // 0x00525F5E

diff --git a/src/OpenLoco/src/Windows/Options.cpp b/src/OpenLoco/src/Windows/Options.cpp
@@ -16,6 +16,7 @@
 #include "Objects/ObjectIndex.h"
 #include "Objects/ObjectManager.h"
 #include "S5/S5.h"
+#include "ScenarioManager.h"
 #include "SceneManager.h"
 #include "Ui.h"
 #include "Ui/Dropdown.h"
@@ -1508,6 +1509,9 @@ namespace OpenLoco::Ui::Windows::Options
             // Reloading the objects will force objects to load the new language
             ObjectManager::reloadAll();
             Gfx::invalidateScreen();
+
+            // Rebuild the scenario index to use the new language.
+            ScenarioManager::loadIndex(true);
         }
 
         // 0x004C0C73