Merge pull request #131 from OpenVicProject/misc-changes

Parse missing variables, Logger counting, misc cleanup

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;