diff options
author | George L. Albany <Megacake1234@gmail.com> | 2023-12-24 23:00:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-24 23:00:36 +0100 |
commit | bf4e7368600bb425b6612231fbb84de34ec99a27 (patch) | |
tree | d3b29714d3286b9edbe380f877bbce541344a635 /src/openvic-simulation/country/Country.cpp | |
parent | f036506b88af02508242f279ca29b743ef713976 (diff) | |
parent | 3770de7a03879a8ff6b8cf22b402217c19fa2b53 (diff) |
Merge pull request #100 from OpenVicProject/change/colour_t_to_struct
Diffstat (limited to 'src/openvic-simulation/country/Country.cpp')
-rw-r--r-- | src/openvic-simulation/country/Country.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/openvic-simulation/country/Country.cpp b/src/openvic-simulation/country/Country.cpp index cb4de8a..299407c 100644 --- a/src/openvic-simulation/country/Country.cpp +++ b/src/openvic-simulation/country/Country.cpp @@ -31,7 +31,7 @@ Country::Country( std::string_view new_identifier, colour_t new_colour, GraphicalCultureType const& new_graphical_culture, IdentifierRegistry<CountryParty>&& new_parties, unit_names_map_t&& new_unit_names, bool new_dynamic_tag, government_colour_map_t&& new_alternative_colours -) : HasIdentifierAndColour { new_identifier, new_colour, false, false }, graphical_culture { new_graphical_culture }, +) : HasIdentifierAndColour { new_identifier, new_colour, false }, graphical_culture { new_graphical_culture }, parties { std::move(new_parties) }, unit_names { std::move(new_unit_names) }, dynamic_tag { new_dynamic_tag }, alternative_colours { std::move(new_alternative_colours) } {} @@ -50,10 +50,6 @@ bool CountryManager::add_country( ); return false; } - if (colour > MAX_COLOUR_RGB) { - Logger::error("Invalid country colour for ", identifier, ": ", colour_to_hex_string(colour)); - return false; - } if (graphical_culture == nullptr) { Logger::error("Null graphical culture for country ", identifier); return false; |