mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 23:10:14 -05:00
Code Issues Projects Releases Wiki Activity

Fix ResourceManagerHelpers initialization order.

Browse Source 
Rename `LoadDelayedPersistentAltAssets` to `LoadDelayedPersistentAssets`.
Remove audio path from LoadDelayedPersistentAssets, as that's already handled in OTRAudio_Init.
Exclude textures/buttons from LoadDelayedPersistentAssets (PNGs, don't have a factory).
This commit is contained in:
Malkierian 2025-01-28 12:07:33 -07:00
parent 22e1e6c8d4
commit e3470a6a0d
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
soh/soh/OTRGlobals.cpp
View File

@ -554,7 +554,7 @@ void OTRAudio_Thread() {
extern "C" void OTRAudio_Init() extern "C" void OTRAudio_Init()
{ {
// Precache all our samples, sequences, etc... // Precache all our samples, sequences, etc...
ResourceMgr_LoadDirectory("audio"); ResourceMgr_LoadDirectory("audio/*");
if (!audio.running) { if (!audio.running) {
audio.running = true; audio.running = true;
@ -1133,11 +1133,9 @@ extern "C" void InitOTR() {
OTRGlobals::Instance = new OTRGlobals(); OTRGlobals::Instance = new OTRGlobals();
ResourceMgr_LoadPersistentAltAssets();
CustomMessageManager::Instance = new CustomMessageManager(); CustomMessageManager::Instance = new CustomMessageManager();
ItemTableManager::Instance = new ItemTableManager(); ItemTableManager::Instance = new ItemTableManager();
GameInteractor::Instance = new GameInteractor(); GameInteractor::Instance = new GameInteractor();
ResourceMgr_RegisterHooks();
SaveManager::Instance = new SaveManager(); SaveManager::Instance = new SaveManager();
std::shared_ptr<Ship::Config> conf = OTRGlobals::Instance->context->GetConfig(); std::shared_ptr<Ship::Config> conf = OTRGlobals::Instance->context->GetConfig();
@ -1168,6 +1166,9 @@ extern "C" void InitOTR() {
OTRMessage_Init(); OTRMessage_Init();
OTRAudio_Init(); OTRAudio_Init();
ResourceMgr_Init();
ResourceMgr_RegisterHooks();
ResourceMgr_LoadPersistentAltAssets();
OTRExtScanner(); OTRExtScanner();
VanillaItemTable_Init(); VanillaItemTable_Init();
DebugConsole_Init(); DebugConsole_Init();
@ -1200,8 +1201,6 @@ extern "C" void InitOTR() {
Sail::Instance->Enable(); Sail::Instance->Enable();
} }
#endif #endif
ResourceMgr_Init();
} }
extern "C" void SaveManager_ThreadPoolWait() { extern "C" void SaveManager_ThreadPoolWait() {

11
soh/soh/ResourceManagerHelpers.cpp
View File

@ -591,12 +591,11 @@ extern "C" void ResourceMgr_UnloadSceneAssets() {
void ResourceMgr_LoadDelayedPersistentAltAssets() { void ResourceMgr_LoadDelayedPersistentAltAssets() {
// Load sound effects first for title screen "Press Start" and pause sounds. These are loaded // Load sound effects first for title screen "Press Start" and pause sounds. These are loaded
// before the alt assets to prevent load lock for the audio itself // before the alt assets to prevent load lock for the audio itself
static std::list<std::string> textureIncludes = {"audio/fonts/00_Sound_Effects_1", "audio/fonts/00_Sound_Effects_2", static std::list<std::string> textureIncludes = { "textures/*", "overlays/*", "code/*", "misc/*", "text/*", "objects/*", "scenes/*",
"audio/*", "textures/*", "overlays/*", "code/*", "misc/*", "text/*", "objects/*", "scenes/*",
"alt/textures/parameter*", "alt/textures/icon*", "alt/textures/item*", "alt/textures/font*", "alt/textures/parameter*", "alt/textures/icon*", "alt/textures/item*", "alt/textures/font*",
"alt/objects/gameplay_*", "alt/overlays/*", "alt/code/*", "alt/textures/*", "alt/objects/gameplay_*", "alt/overlays/*", "alt/code/*", "alt/textures/*",
}; };
static std::list<std::string> textureExcludes = { "alt/textures/vr_holy*", "alt/textures/vr_cloud*", "alt/textures/vr_fine*" }; static std::list<std::string> textureExcludes = { "alt/textures/vr_holy*", "alt/textures/vr_cloud*", "alt/textures/vr_fine*", "textures/buttons/*" };
Ship::Context::GetInstance()->GetResourceManager()->LoadResourcesAsync({textureIncludes, textureExcludes, 0, nullptr}); Ship::Context::GetInstance()->GetResourceManager()->LoadResourcesAsync({textureIncludes, textureExcludes, 0, nullptr});
} }
@ -638,16 +637,10 @@ extern "C" void ResourceMgr_LoadPersistentAltAssets() {
ResourceLoadDirectoryAsync("alt/scenes/*/spot00*"); ResourceLoadDirectoryAsync("alt/scenes/*/spot00*");
// Title logos // Title logos
ResourceLoadDirectoryAsync("alt/objects/object_mag/*"); ResourceLoadDirectoryAsync("alt/objects/object_mag/*");
// Title screen music
Ship::Context::GetInstance()->GetResourceManager()->LoadResourceAsync("audio/sequences/030_Title_Theme");
Ship::Context::GetInstance()->GetResourceManager()->LoadResourceAsync("audio/fonts/06_Title_Theme");
} else if (skipTitle && fastFile == 4) { } else if (skipTitle && fastFile == 4) {
Ship::Context::GetInstance()->GetResourceManager()->LoadResourcesAsync({ Ship::Context::GetInstance()->GetResourceManager()->LoadResourcesAsync({
{"alt/overlays/ovl_file_choose/*", "alt/textures/title_static/*", "alt/objects/gameplay_keep/*", "alt/textures/vr_fine3*", "alt/textures/vr_fine0*"}, {"alt/overlays/ovl_file_choose/*", "alt/textures/title_static/*", "alt/objects/gameplay_keep/*", "alt/textures/vr_fine3*", "alt/textures/vr_fine0*"},
{}, 0, nullptr}); {}, 0, nullptr});
// File Select music
Ship::Context::GetInstance()->GetResourceManager()->LoadResourceAsync("audio/sequences/087_File_Select");
Ship::Context::GetInstance()->GetResourceManager()->LoadResourceAsync("audio/fonts/09_Fairy_Fountain");
} else if (skipTitle && fastFile < 3) { } else if (skipTitle && fastFile < 3) {
ResourceLoadDirectoryAsync("alt/textures/icon*"); ResourceLoadDirectoryAsync("alt/textures/icon*");
ResourceLoadDirectoryAsync("alt/textures/do_action_static/*"); ResourceLoadDirectoryAsync("alt/textures/do_action_static/*");