diff options
| author |   BetterBite <38665746+BetterBite@users.noreply.github.com> | 2024-02-15 16:01:31 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-02-15 16:01:31 +0100 |
| commit | 35e5f7828a41736194362186ad4f946fad5964d1 (patch) | |
| tree | 71f9f443cde7d71f3b6a781b3619b6ab25d4f8cb /src/openvic-simulation/dataloader | |
| parent | 5216e893ebc5253b123bbf15b7509745d38f5a80 (diff) | |
| parent | 28778e57a72ffebbf6053e32db6cb723f1d76670 (diff) | |
Merge pull request #146 from BetterBite/master
Implemented loading of country unit colours
Diffstat (limited to 'src/openvic-simulation/dataloader')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 157ff04..56cf40c 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -808,6 +808,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"; @@ -985,6 +986,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() )) { |