From 28778e57a72ffebbf6053e32db6cb723f1d76670 Mon Sep 17 00:00:00 2001
From: BetterBite <38665746+BetterBite@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:25:35 +0000
Subject: Added country unit colour loading

add skeleton for loading country colours

created load_countries_colours function

removed const for unit colours in Country.hpp

removed some comments

Removed erroneous underscore

Removed todo comment
---
 src/openvic-simulation/dataloader/Dataloader.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/openvic-simulation/dataloader')

diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp
index c6d6281..6f55267 100644
--- a/src/openvic-simulation/dataloader/Dataloader.cpp
+++ b/src/openvic-simulation/dataloader/Dataloader.cpp
@@ -795,6 +795,7 @@ bool Dataloader::load_defines(GameManager& game_manager) {
 	static constexpr std::string_view buildings_file = "common/buildings.txt";
 	static constexpr std::string_view bookmark_file = "common/bookmarks.txt";
 	static constexpr std::string_view countries_file = "common/countries.txt";
+	static constexpr std::string_view country_colours_file = "common/country_colors.txt";
 	static constexpr std::string_view culture_file = "common/cultures.txt";
 	static constexpr std::string_view governments_file = "common/governments.txt";
 	static constexpr std::string_view graphical_culture_type_file = "common/graphicalculturetype.txt";
@@ -972,6 +973,12 @@ bool Dataloader::load_defines(GameManager& game_manager) {
 		Logger::error("Failed to load countries!");
 		ret = false;
 	}
+	if (!game_manager.get_country_manager().load_country_colours(
+		parse_defines(lookup_file(country_colours_file)).get_file_node()
+	)) {
+		Logger::error("Failed to load country colours!");
+		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()
 	)) {
-- 
cgit v1.2.3-56-ga3b1