diff options
| author |   Hop311 <hop3114@gmail.com> | 2023-09-09 22:49:52 +0200 |
|---|---|---|
| committer | Hop311 <hop3114@gmail.com> | 2023-09-09 22:50:29 +0200 |
| commit | 3d7fbd9b376811ca0ed226fa78bcc8b6279ba8dc (patch) | |
| tree | eb36a9b030b263d825eb93638e64deb0dbd38a78 /src/openvic-simulation/map | |
| parent | b4220ad73e14e3b497b2fdeb83d76a6633664764 (diff) | |
Format cleanup and req comments
Diffstat (limited to 'src/openvic-simulation/map')
| -rw-r--r-- | src/openvic-simulation/map/Map.cpp | 8 | ||||
| -rw-r--r-- | src/openvic-simulation/map/Province.cpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/map/Province.hpp | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/openvic-simulation/map/Map.cpp b/src/openvic-simulation/map/Map.cpp index 8f10410..728fc42 100644 --- a/src/openvic-simulation/map/Map.cpp +++ b/src/openvic-simulation/map/Map.cpp @@ -490,11 +490,9 @@ bool Map::load_province_definitions(std::vector<LineObject> const& lines) { const std::string_view identifier = line.get_value_for(0); if (!identifier.empty()) { colour_t colour; - if (!parse_province_colour(colour, { - line.get_value_for(1), - line.get_value_for(2), - line.get_value_for(3) - })) { + if (!parse_province_colour(colour, + { line.get_value_for(1), line.get_value_for(2), line.get_value_for(3) } + )) { Logger::error("Error reading colour in province definition: ", line); ret = false; } diff --git a/src/openvic-simulation/map/Province.cpp b/src/openvic-simulation/map/Province.cpp index 8d4abcb..f53de3a 100644 --- a/src/openvic-simulation/map/Province.cpp +++ b/src/openvic-simulation/map/Province.cpp @@ -102,7 +102,7 @@ distribution_t const& Province::get_religion_distribution() const { } /* REQUIREMENTS: - * MAP-65 + * MAP-65, MAP-68, MAP-70, MAP-234 */ void Province::update_pops() { total_population = 0; diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp index 682fc16..67816ff 100644 --- a/src/openvic-simulation/map/Province.hpp +++ b/src/openvic-simulation/map/Province.hpp @@ -10,6 +10,7 @@ namespace OpenVic { /* REQUIREMENTS: * MAP-5, MAP-7, MAP-8, MAP-43, MAP-47 + * POP-22 */ struct Province : HasIdentifierAndColour { friend struct Map; |