From afc16e76ba699b24ba1ef1cb1b658ef421c84430 Mon Sep 17 00:00:00 2001 From: Hop311 Date: Sat, 12 Aug 2023 14:10:40 +0100 Subject: std::string const& --> const std::string_view --- src/openvic/map/Region.cpp | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'src/openvic/map/Region.cpp') diff --git a/src/openvic/map/Region.cpp b/src/openvic/map/Region.cpp index b83f556..fc207e3 100644 --- a/src/openvic/map/Region.cpp +++ b/src/openvic/map/Region.cpp @@ -4,6 +4,41 @@ using namespace OpenVic; +return_t ProvinceSet::add_province(Province* province) { + if (locked) { + Logger::error("Cannot add province to province set - locked!"); + return FAILURE; + } + if (province == nullptr) { + Logger::error("Cannot add province to province set - null province!"); + return FAILURE; + } + if (contains_province(province)) { + Logger::error("Cannot add province ", province->get_identifier(), " to province set - already in the set!"); + return FAILURE; + } + provinces.push_back(province); + return SUCCESS; +} + +void ProvinceSet::lock(bool log) { + if (locked) { + Logger::error("Failed to lock province set - already locked!"); + } else { + locked = true; + if (log) Logger::info("Locked province set with ", get_province_count(), " provinces"); + } +} + +bool ProvinceSet::is_locked() const { + return locked; +} + +void ProvinceSet::reset() { + provinces.clear(); + locked = false; +} + size_t ProvinceSet::get_province_count() const { return provinces.size(); } @@ -16,7 +51,7 @@ std::vector const& ProvinceSet::get_provinces() const { return provinces; } -Region::Region(std::string const& new_identifier) : HasIdentifier { new_identifier } {} +Region::Region(const std::string_view new_identifier) : HasIdentifier { new_identifier } {} colour_t Region::get_colour() const { if (provinces.empty()) return FULL_COLOUR << 16; -- cgit v1.2.3-56-ga3b1