aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/dataloader/Dataloader.cpp
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-01-17 23:24:39 +0100
committer hop311 <hop3114@gmail.com>2024-01-18 23:29:40 +0100
commite33a330129364b4bd632b2fd531a996b8c57cefb (patch)
tree88365260addebee9d3ac798d484e02ab18f56692 /src/openvic-simulation/dataloader/Dataloader.cpp
parentb5783116f67c9f7aa9d8d9653e6bda0227f67cd2 (diff)
Parse missing variables, Logger counting, misc cleanup
Diffstat (limited to 'src/openvic-simulation/dataloader/Dataloader.cpp')
-rw-r--r--src/openvic-simulation/dataloader/Dataloader.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp
index 0078ed2..b5a32d3 100644
--- a/src/openvic-simulation/dataloader/Dataloader.cpp
+++ b/src/openvic-simulation/dataloader/Dataloader.cpp
@@ -791,12 +791,6 @@ bool Dataloader::load_defines(GameManager& game_manager) {
Logger::error("Failed to load graphical culture types!");
ret = false;
}
- if (!game_manager.get_pop_manager().get_culture_manager().load_culture_file(
- parse_defines(lookup_file(culture_file)).get_file_node()
- )) {
- Logger::error("Failed to load cultures!");
- ret = false;
- }
if (!game_manager.get_pop_manager().get_religion_manager().load_religion_file(
parse_defines(lookup_file(religion_file)).get_file_node()
)) {
@@ -928,6 +922,12 @@ bool Dataloader::load_defines(GameManager& game_manager) {
Logger::error("Failed to load countries!");
ret = false;
}
+ if (!game_manager.get_pop_manager().get_culture_manager().load_culture_file(
+ game_manager.get_country_manager(), parse_defines(lookup_file(culture_file)).get_file_node()
+ )) {
+ Logger::error("Failed to load cultures!");
+ ret = false;
+ }
if (!_load_decisions(game_manager)) {
Logger::error("Failde to load decisions!");
ret = false;