1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00

Move TitleSequenceManager::Scan into preloader as well

Add strings for checking and loading title sequence
This commit is contained in:
Aaron van Geffen
2024-05-06 14:08:49 +02:00
parent 809fe4a51b
commit db73b1fede
5 changed files with 19 additions and 3 deletions

View File

@@ -3707,6 +3707,8 @@ STR_6632 :Checking object files...
STR_6633 :Checking scenario files...
STR_6634 :Checking track design files...
STR_6635 :Checking asset packs...
STR_6636 :Checking title sequences...
STR_6637 :Loading title sequence...
#############
# Scenarios #

View File

@@ -518,8 +518,6 @@ namespace OpenRCT2
ContextInit();
TitleSequenceManager::Scan();
if (!gOpenRCT2Headless)
{
auto* preloaderScene = GetPreloaderScene();
@@ -570,6 +568,12 @@ namespace OpenRCT2
preloaderScene->UpdateCaption(STR_CHECKING_SCENARIO_FILES);
_scenarioRepository->Scan(currentLanguage);
preloaderScene->UpdateCaption(STR_CHECKING_TITLE_SEQUENCES);
TitleSequenceManager::Scan();
if (preloaderScene->GetCompletionScene() == GetTitleScene())
preloaderScene->UpdateCaption(STR_LOADING_TITLE_SEQUENCE);
else
preloaderScene->UpdateCaption(STR_LOADING_GENERIC);
}

View File

@@ -3860,6 +3860,8 @@ enum : uint16_t
STR_CHECKING_SCENARIO_FILES = 6633,
STR_CHECKING_TRACK_DESIGN_FILES = 6634,
STR_CHECKING_ASSET_PACKS = 6635,
STR_CHECKING_TITLE_SEQUENCES = 6636,
STR_LOADING_TITLE_SEQUENCE = 6637,
// Have to include resource strings (from scenarios and objects) for the time being now that language is partially working
/* MAX_STR_COUNT = 32768 */ // MAX_STR_COUNT - upper limit for number of strings, not the current count strings

View File

@@ -38,6 +38,11 @@ void Scene::FinishScene()
}
}
IScene* Scene::GetCompletionScene()
{
return _nextScene;
}
void Scene::SetCompletionScene(IScene* scene)
{
_nextScene = scene;

View File

@@ -27,6 +27,8 @@ namespace OpenRCT2
virtual void Load() = 0;
virtual void Tick() = 0;
virtual void Stop() = 0;
virtual IScene* GetCompletionScene() = 0;
virtual void SetCompletionScene(IScene* scene) = 0;
};
@@ -38,6 +40,7 @@ namespace OpenRCT2
GameState_t& GetGameState() override;
IContext& GetContext() override;
IScene* GetCompletionScene() override;
void SetCompletionScene(IScene* scene) override;
protected: