diff options
author | hop311 <hop3114@gmail.com> | 2024-08-11 00:40:07 +0200 |
---|---|---|
committer | hop311 <hop3114@gmail.com> | 2024-08-14 00:07:46 +0200 |
commit | 7e05aaccf0e13299702ddeed17661831c3ddc692 (patch) | |
tree | b85022a240a4a24c0ee0fd44cd59ff6bc112c18f /src/openvic-simulation/dataloader/Dataloader.cpp | |
parent | 9f9c5844bfedc5e366a35cdba386027fb9f3a14a (diff) |
Assorted minor fixes (clang-format.sh shebang, parse national foci scripts, factor song chance, update openvic-dataloader)assorted-fixes
Diffstat (limited to 'src/openvic-simulation/dataloader/Dataloader.cpp')
-rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 63571c7..1be040f 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -831,7 +831,7 @@ bool Dataloader::_load_song_chances(DefinitionManager& definition_manager) { bool ret = true; SongChanceManager& song_chance_manager = definition_manager.get_song_chance_manager(); - if(path.empty()) { + if (path.empty()) { Logger::info("No Songs.txt file to load"); song_chance_manager.lock_song_chances(); return true; @@ -1096,7 +1096,7 @@ bool Dataloader::load_defines(DefinitionManager& definition_manager) { Logger::error("Failed to load diplomatic actions!"); ret = false; } - if(!definition_manager.get_script_manager().get_condition_manager().setup_conditions(definition_manager)) { + if (!definition_manager.get_script_manager().get_condition_manager().setup_conditions(definition_manager)) { Logger::error("Failed to set up conditions!"); ret = false; } @@ -1131,6 +1131,7 @@ bool Dataloader::parse_scripts(DefinitionManager& definition_manager) const { PARSE_SCRIPTS("decision", definition_manager.get_decision_manager()); PARSE_SCRIPTS("event", definition_manager.get_event_manager()); PARSE_SCRIPTS("song chance", definition_manager.get_song_chance_manager()); + PARSE_SCRIPTS("national focus", definition_manager.get_politics_manager().get_national_focus_manager()); return ret; } |