From 0b4732befaaf4a742acb319256c535eb449668a7 Mon Sep 17 00:00:00 2001 From: Nemrav <> Date: Thu, 1 Aug 2024 18:17:24 -0300 Subject: Music and Sound Effect define loading sound and music pr feedback more sound and music style fixes check lookup path --- src/openvic-simulation/GameManager.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/openvic-simulation/GameManager.cpp') diff --git a/src/openvic-simulation/GameManager.cpp b/src/openvic-simulation/GameManager.cpp index cd810ea..2577b54 100644 --- a/src/openvic-simulation/GameManager.cpp +++ b/src/openvic-simulation/GameManager.cpp @@ -11,9 +11,15 @@ GameManager::GameManager( new_clock_state_changed_callback ? std::move(new_clock_state_changed_callback) : []() {} }, definitions_loaded { false } {} -bool GameManager::load_definitions( - Dataloader::path_vector_t const& roots, Dataloader::localisation_callback_t localisation_callback -) { +bool GameManager::set_roots(Dataloader::path_vector_t const& roots) { + if (!dataloader.set_roots(roots)) { + Logger::error("Failed to set dataloader roots!"); + return false; + } + return true; +} + +bool GameManager::load_definitions(Dataloader::localisation_callback_t localisation_callback) { if (definitions_loaded) { Logger::error("Cannot load definitions - already loaded!"); return false; @@ -21,11 +27,6 @@ bool GameManager::load_definitions( bool ret = true; - if (!dataloader.set_roots(roots)) { - Logger::error("Failed to set dataloader roots!"); - ret = false; - } - if (!dataloader.load_defines(definition_manager)) { Logger::error("Failed to load defines!"); ret = false; -- cgit v1.2.3-56-ga3b1