From 4ef33d4df6198e613b0f27406d49978c8ea2fb97 Mon Sep 17 00:00:00 2001 From: zaaarf Date: Sun, 10 Dec 2023 23:15:41 +0100 Subject: feat: improved identifier registry macro --- src/openvic-simulation/country/Country.cpp | 2 - src/openvic-simulation/country/Country.hpp | 9 +-- src/openvic-simulation/economy/BuildingType.cpp | 2 - src/openvic-simulation/economy/BuildingType.hpp | 5 +- src/openvic-simulation/economy/Good.cpp | 2 - src/openvic-simulation/economy/Good.hpp | 8 +-- src/openvic-simulation/economy/ProductionType.cpp | 2 +- src/openvic-simulation/economy/ProductionType.hpp | 3 +- src/openvic-simulation/history/Bookmark.cpp | 2 - src/openvic-simulation/history/Bookmark.hpp | 6 +- src/openvic-simulation/interface/GUI.cpp | 8 +-- src/openvic-simulation/interface/GUI.hpp | 11 ++-- src/openvic-simulation/interface/UI.cpp | 2 - src/openvic-simulation/interface/UI.hpp | 15 ++--- src/openvic-simulation/map/Crime.cpp | 2 - src/openvic-simulation/map/Crime.hpp | 5 +- src/openvic-simulation/map/Map.cpp | 2 - src/openvic-simulation/map/Map.hpp | 11 +--- src/openvic-simulation/map/Province.hpp | 3 +- src/openvic-simulation/map/TerrainType.cpp | 3 - src/openvic-simulation/map/TerrainType.hpp | 8 +-- src/openvic-simulation/military/Deployment.cpp | 2 - src/openvic-simulation/military/Deployment.hpp | 5 +- src/openvic-simulation/military/LeaderTrait.cpp | 2 - src/openvic-simulation/military/LeaderTrait.hpp | 5 +- src/openvic-simulation/military/Unit.cpp | 2 - src/openvic-simulation/military/Unit.hpp | 5 +- src/openvic-simulation/military/Wargoal.cpp | 2 - src/openvic-simulation/military/Wargoal.hpp | 5 +- src/openvic-simulation/misc/Decision.cpp | 2 - src/openvic-simulation/misc/Decision.hpp | 5 +- src/openvic-simulation/misc/Define.cpp | 2 - src/openvic-simulation/misc/Define.hpp | 5 +- src/openvic-simulation/misc/Event.cpp | 2 - src/openvic-simulation/misc/Event.hpp | 5 +- src/openvic-simulation/misc/Modifier.cpp | 4 -- src/openvic-simulation/misc/Modifier.hpp | 14 ++-- src/openvic-simulation/politics/Government.cpp | 4 -- src/openvic-simulation/politics/Government.hpp | 5 +- src/openvic-simulation/politics/Ideology.cpp | 2 - src/openvic-simulation/politics/Ideology.hpp | 8 +-- src/openvic-simulation/politics/Issue.cpp | 4 -- src/openvic-simulation/politics/Issue.hpp | 17 ++--- src/openvic-simulation/politics/NationalFocus.cpp | 2 - src/openvic-simulation/politics/NationalFocus.hpp | 8 +-- src/openvic-simulation/politics/NationalValue.cpp | 2 - src/openvic-simulation/politics/NationalValue.hpp | 5 +- src/openvic-simulation/politics/Rebel.cpp | 2 - src/openvic-simulation/politics/Rebel.hpp | 5 +- src/openvic-simulation/pop/Culture.cpp | 3 - src/openvic-simulation/pop/Culture.hpp | 11 +--- src/openvic-simulation/pop/Pop.cpp | 2 +- src/openvic-simulation/pop/Pop.hpp | 3 +- src/openvic-simulation/pop/Religion.cpp | 2 - src/openvic-simulation/pop/Religion.hpp | 8 +-- src/openvic-simulation/research/Invention.cpp | 2 - src/openvic-simulation/research/Invention.hpp | 6 +- src/openvic-simulation/research/Technology.cpp | 4 -- src/openvic-simulation/research/Technology.hpp | 14 ++-- .../types/IdentifierRegistry.hpp | 77 +++++++++------------- 60 files changed, 92 insertions(+), 282 deletions(-) (limited to 'src') diff --git a/src/openvic-simulation/country/Country.cpp b/src/openvic-simulation/country/Country.cpp index 935c409..cb4de8a 100644 --- a/src/openvic-simulation/country/Country.cpp +++ b/src/openvic-simulation/country/Country.cpp @@ -35,8 +35,6 @@ Country::Country( parties { std::move(new_parties) }, unit_names { std::move(new_unit_names) }, dynamic_tag { new_dynamic_tag }, alternative_colours { std::move(new_alternative_colours) } {} -CountryManager::CountryManager() : countries { "countries" } {} - bool CountryManager::add_country( std::string_view identifier, colour_t colour, GraphicalCultureType const* graphical_culture, IdentifierRegistry&& parties, Country::unit_names_map_t&& unit_names, bool dynamic_tag, diff --git a/src/openvic-simulation/country/Country.hpp b/src/openvic-simulation/country/Country.hpp index 5d25b33..c35cf4f 100644 --- a/src/openvic-simulation/country/Country.hpp +++ b/src/openvic-simulation/country/Country.hpp @@ -58,7 +58,7 @@ namespace OpenVic { /* Not const to allow elements to be moved, otherwise a copy is forced * which causes a compile error as the copy constructor has been deleted. */ - IdentifierRegistry parties; + IdentifierRegistry IDENTIFIER_REGISTRY_CUSTOM_PLURAL(party, parties); const unit_names_map_t PROPERTY(unit_names); const bool PROPERTY_CUSTOM_PREFIX(dynamic_tag, is); const government_colour_map_t PROPERTY(alternative_colours); @@ -72,28 +72,23 @@ namespace OpenVic { public: Country(Country&&) = default; - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(party, parties) - // TODO - get_colour including alternative colours }; struct CountryManager { private: - IdentifierRegistry countries; + IdentifierRegistry IDENTIFIER_REGISTRY_CUSTOM_PLURAL(country, countries); NodeTools::node_callback_t load_country_party( PoliticsManager const& politics_manager, IdentifierRegistry& country_parties ) const; public: - CountryManager(); - bool add_country( std::string_view identifier, colour_t colour, GraphicalCultureType const* graphical_culture, IdentifierRegistry&& parties, Country::unit_names_map_t&& unit_names, bool dynamic_tag, Country::government_colour_map_t&& alternative_colours ); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(country, countries) bool load_countries(GameManager const& game_manager, Dataloader const& dataloader, ast::NodeCPtr root); bool load_country_data_file( diff --git a/src/openvic-simulation/economy/BuildingType.cpp b/src/openvic-simulation/economy/BuildingType.cpp index 876afd9..a5a4fb0 100644 --- a/src/openvic-simulation/economy/BuildingType.cpp +++ b/src/openvic-simulation/economy/BuildingType.cpp @@ -14,8 +14,6 @@ BuildingType::BuildingType( colonial_range { colonial_range }, infrastructure { infrastructure }, spawn_railway_track { spawn_railway_track }, sail { sail }, steam { steam }, capital { capital }, port { port } {} -BuildingTypeManager::BuildingTypeManager() : building_types { "building types" } {} - bool BuildingTypeManager::add_building_type(std::string_view identifier, ARGS) { if (identifier.empty()) { Logger::error("Invalid building identifier - empty!"); diff --git a/src/openvic-simulation/economy/BuildingType.hpp b/src/openvic-simulation/economy/BuildingType.hpp index deba77a..a8f9d61 100644 --- a/src/openvic-simulation/economy/BuildingType.hpp +++ b/src/openvic-simulation/economy/BuildingType.hpp @@ -73,13 +73,10 @@ namespace OpenVic { using level_t = BuildingType::level_t; // this is getting ridiculous private: - IdentifierRegistry building_types; + IdentifierRegistry IDENTIFIER_REGISTRY(building_type); public: - BuildingTypeManager(); - bool add_building_type(std::string_view identifier, ARGS); - IDENTIFIER_REGISTRY_ACCESSORS(building_type) bool load_buildings_file( GoodManager const& good_manager, ProductionTypeManager const& production_type_manager, diff --git a/src/openvic-simulation/economy/Good.cpp b/src/openvic-simulation/economy/Good.cpp index ac3c8c7..5500483 100644 --- a/src/openvic-simulation/economy/Good.cpp +++ b/src/openvic-simulation/economy/Good.cpp @@ -21,8 +21,6 @@ void Good::reset_to_defaults() { price = base_price; } -GoodManager::GoodManager() : good_categories { "good categories" }, goods { "goods" } {} - bool GoodManager::add_good_category(std::string_view identifier) { if (identifier.empty()) { Logger::error("Invalid good category identifier - empty!"); diff --git a/src/openvic-simulation/economy/Good.hpp b/src/openvic-simulation/economy/Good.hpp index 1537514..c595768 100644 --- a/src/openvic-simulation/economy/Good.hpp +++ b/src/openvic-simulation/economy/Good.hpp @@ -63,20 +63,16 @@ namespace OpenVic { struct GoodManager { private: - IdentifierRegistry good_categories; - IdentifierRegistry goods; + IdentifierRegistry IDENTIFIER_REGISTRY_CUSTOM_PLURAL(good_category, good_categories); + IdentifierRegistry IDENTIFIER_REGISTRY(good); public: - GoodManager(); - bool add_good_category(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(good_category, good_categories) bool add_good( std::string_view identifier, colour_t colour, GoodCategory const& category, Good::price_t base_price, bool available_from_start, bool tradeable, bool money, bool overseas_penalty ); - IDENTIFIER_REGISTRY_ACCESSORS(good) void reset_to_defaults(); bool load_goods_file(ast::NodeCPtr root); diff --git a/src/openvic-simulation/economy/ProductionType.cpp b/src/openvic-simulation/economy/ProductionType.cpp index d0b90fa..a19b7bf 100644 --- a/src/openvic-simulation/economy/ProductionType.cpp +++ b/src/openvic-simulation/economy/ProductionType.cpp @@ -14,7 +14,7 @@ ProductionType::ProductionType( input_goods { std::move(input_goods) }, output_goods { output_goods }, value { value }, bonuses { std::move(bonuses) }, efficiency { std::move(efficiency) }, coastal { coastal }, farm { farm }, mine { mine } {} -ProductionTypeManager::ProductionTypeManager() : production_types { "production types" }, rgo_owner_sprite { 0 } {} +ProductionTypeManager::ProductionTypeManager() : rgo_owner_sprite { 0 } {} node_callback_t ProductionTypeManager::_expect_employed_pop( GoodManager const& good_manager, PopManager const& pop_manager, callback_t cb diff --git a/src/openvic-simulation/economy/ProductionType.hpp b/src/openvic-simulation/economy/ProductionType.hpp index bce3698..4fdceda 100644 --- a/src/openvic-simulation/economy/ProductionType.hpp +++ b/src/openvic-simulation/economy/ProductionType.hpp @@ -66,7 +66,7 @@ namespace OpenVic { struct ProductionTypeManager { private: - IdentifierRegistry production_types; + IdentifierRegistry IDENTIFIER_REGISTRY(production_type); PopType::sprite_t PROPERTY(rgo_owner_sprite); NodeTools::node_callback_t _expect_employed_pop( @@ -81,7 +81,6 @@ namespace OpenVic { ProductionTypeManager(); bool add_production_type(PRODUCTION_TYPE_ARGS); - IDENTIFIER_REGISTRY_ACCESSORS(production_type) bool load_production_types_file(GoodManager const& good_manager, PopManager const& pop_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/history/Bookmark.cpp b/src/openvic-simulation/history/Bookmark.cpp index e9543be..2927950 100644 --- a/src/openvic-simulation/history/Bookmark.cpp +++ b/src/openvic-simulation/history/Bookmark.cpp @@ -16,8 +16,6 @@ Bookmark::Bookmark( ) : HasIdentifier { std::to_string(new_index) }, name { new_name }, description { new_description }, date { new_date }, initial_camera_x { new_initial_camera_x }, initial_camera_y { new_initial_camera_y } {} -BookmarkManager::BookmarkManager() : bookmarks { "bookmarks" } {} - bool BookmarkManager::add_bookmark( std::string_view name, std::string_view description, Date date, uint32_t initial_camera_x, uint32_t initial_camera_y ) { diff --git a/src/openvic-simulation/history/Bookmark.hpp b/src/openvic-simulation/history/Bookmark.hpp index 18375fb..7401105 100644 --- a/src/openvic-simulation/history/Bookmark.hpp +++ b/src/openvic-simulation/history/Bookmark.hpp @@ -30,17 +30,13 @@ namespace OpenVic { struct BookmarkManager { private: - IdentifierRegistry bookmarks; + IdentifierRegistry IDENTIFIER_REGISTRY(bookmark); public: - BookmarkManager(); - bool add_bookmark( std::string_view name, std::string_view description, Date date, uint32_t initial_camera_x, uint32_t initial_camera_y ); - IDENTIFIER_REGISTRY_ACCESSORS(bookmark) - bool load_bookmark_file(ast::NodeCPtr root); }; } diff --git a/src/openvic-simulation/interface/GUI.cpp b/src/openvic-simulation/interface/GUI.cpp index 61b8683..244909e 100644 --- a/src/openvic-simulation/interface/GUI.cpp +++ b/src/openvic-simulation/interface/GUI.cpp @@ -42,11 +42,9 @@ bool Element::_fill_elements_key_map( return ret; } -Scene::Scene() : elements { "scene elements" } {} - bool Scene::_fill_key_map(NodeTools::key_map_t& key_map, UIManager const& ui_manager) { return Element::_fill_elements_key_map(key_map, [this](std::unique_ptr&& element) -> bool { - return elements.add_item(std::move(element)); + return scene_elements.add_item(std::move(element)); }, ui_manager); } @@ -59,11 +57,11 @@ node_callback_t Scene::expect_scene( }, ui_manager); } -Window::Window() : elements { "window elements" }, size {}, moveable { false }, fullscreen { false } {} +Window::Window() : moveable { false }, fullscreen { false } {} bool Window::_fill_key_map(NodeTools::key_map_t& key_map, UIManager const& ui_manager) { bool ret = Element::_fill_elements_key_map(key_map, [this](std::unique_ptr&& element) -> bool { - return elements.add_item(std::move(element)); + return window_elements.add_item(std::move(element)); }, ui_manager); ret &= Element::_fill_key_map(key_map, ui_manager); ret &= add_key_map_entries(key_map, diff --git a/src/openvic-simulation/interface/GUI.hpp b/src/openvic-simulation/interface/GUI.hpp index f8434f6..47bd57d 100644 --- a/src/openvic-simulation/interface/GUI.hpp +++ b/src/openvic-simulation/interface/GUI.hpp @@ -40,10 +40,10 @@ namespace OpenVic::GUI { class Scene : public Named { friend std::unique_ptr std::make_unique(); - NamedInstanceRegistry elements; + NamedInstanceRegistry IDENTIFIER_REGISTRY(scene_element); protected: - Scene(); + Scene() = default; bool _fill_key_map(NodeTools::key_map_t& key_map, UIManager const& ui_manager) override; @@ -57,13 +57,12 @@ namespace OpenVic::GUI { std::string_view scene_name, NodeTools::callback_t&&> callback, UIManager const& ui_manager ); - IDENTIFIER_REGISTRY_ACCESSORS(element) }; class Window final : public Element { friend std::unique_ptr std::make_unique(); - NamedInstanceRegistry elements; + NamedInstanceRegistry IDENTIFIER_REGISTRY(window_element); fvec2_t PROPERTY(size); bool PROPERTY(moveable); @@ -80,8 +79,6 @@ namespace OpenVic::GUI { virtual ~Window() = default; OV_DETAIL_GET_TYPE - - IDENTIFIER_REGISTRY_ACCESSORS(element) }; class Icon final : public Element { @@ -127,7 +124,7 @@ namespace OpenVic::GUI { // TODO - clicksound protected: - Button() ; + Button(); bool _fill_key_map(NodeTools::key_map_t& key_map, UIManager const& ui_manager) override; diff --git a/src/openvic-simulation/interface/UI.cpp b/src/openvic-simulation/interface/UI.cpp index 4653e5b..3fc8295 100644 --- a/src/openvic-simulation/interface/UI.cpp +++ b/src/openvic-simulation/interface/UI.cpp @@ -5,8 +5,6 @@ using namespace OpenVic::NodeTools; using namespace OpenVic::GFX; using namespace OpenVic::GUI; -UIManager::UIManager() : sprites { "sprites" }, scenes { "scenes" }, fonts { "fonts" } {} - bool UIManager::add_font(std::string_view identifier, colour_t colour, std::string_view fontname) { if (identifier.empty()) { Logger::error("Invalid font identifier - empty!"); diff --git a/src/openvic-simulation/interface/UI.hpp b/src/openvic-simulation/interface/UI.hpp index 045766b..12eadb5 100644 --- a/src/openvic-simulation/interface/UI.hpp +++ b/src/openvic-simulation/interface/UI.hpp @@ -4,21 +4,14 @@ namespace OpenVic { - class UIManager { - - NamedInstanceRegistry sprites; - NamedInstanceRegistry scenes; - IdentifierRegistry fonts; + class UIManager { + NamedInstanceRegistry IDENTIFIER_REGISTRY(sprite); + NamedInstanceRegistry IDENTIFIER_REGISTRY(scene); + IdentifierRegistry IDENTIFIER_REGISTRY(font); bool _load_font(ast::NodeCPtr node); public: - UIManager(); - - IDENTIFIER_REGISTRY_ACCESSORS(sprite) - IDENTIFIER_REGISTRY_ACCESSORS(scene) - IDENTIFIER_REGISTRY_ACCESSORS(font) - bool add_font(std::string_view identifier, colour_t colour, std::string_view fontname); bool load_gfx_file(ast::NodeCPtr root); diff --git a/src/openvic-simulation/map/Crime.cpp b/src/openvic-simulation/map/Crime.cpp index 3a9ae64..c0bc04e 100644 --- a/src/openvic-simulation/map/Crime.cpp +++ b/src/openvic-simulation/map/Crime.cpp @@ -6,8 +6,6 @@ using namespace OpenVic::NodeTools; Crime::Crime(std::string_view new_identifier, ModifierValue&& new_values, icon_t new_icon, bool new_default_active) : TriggeredModifier { new_identifier, std::move(new_values), new_icon }, default_active { new_default_active } {} -CrimeManager::CrimeManager() : crime_modifiers { "crime modifiers" } {} - bool CrimeManager::add_crime_modifier( std::string_view identifier, ModifierValue&& values, Modifier::icon_t icon, bool default_active ) { diff --git a/src/openvic-simulation/map/Crime.hpp b/src/openvic-simulation/map/Crime.hpp index d0dd844..26f52ab 100644 --- a/src/openvic-simulation/map/Crime.hpp +++ b/src/openvic-simulation/map/Crime.hpp @@ -17,15 +17,12 @@ namespace OpenVic { struct CrimeManager { private: - IdentifierRegistry crime_modifiers; + IdentifierRegistry IDENTIFIER_REGISTRY(crime_modifier); public: - CrimeManager(); - bool add_crime_modifier( std::string_view identifier, ModifierValue&& values, Modifier::icon_t icon, bool default_active ); - IDENTIFIER_REGISTRY_ACCESSORS(crime_modifier) bool load_crime_modifiers(ModifierManager const& modifier_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/map/Map.cpp b/src/openvic-simulation/map/Map.cpp index 7bf5e7d..18f72cf 100644 --- a/src/openvic-simulation/map/Map.cpp +++ b/src/openvic-simulation/map/Map.cpp @@ -25,8 +25,6 @@ Mapmode::base_stripe_t Mapmode::get_base_stripe_colours(Map const& map, Province return colour_func ? colour_func(map, province) : NULL_COLOUR; } -Map::Map() : provinces { "provinces" }, regions { "regions" }, mapmodes { "mapmodes" } {} - bool Map::add_province(std::string_view identifier, colour_t colour) { if (provinces.size() >= max_provinces) { Logger::error( diff --git a/src/openvic-simulation/map/Map.hpp b/src/openvic-simulation/map/Map.hpp index bb760e6..16d12a8 100644 --- a/src/openvic-simulation/map/Map.hpp +++ b/src/openvic-simulation/map/Map.hpp @@ -53,9 +53,9 @@ namespace OpenVic { private: using colour_index_map_t = std::map; - IdentifierRegistry provinces; - IdentifierRegistry regions; - IdentifierRegistry mapmodes; + IdentifierRegistry IDENTIFIER_REGISTRY_CUSTOM_INDEX_OFFSET(province, 1); + IdentifierRegistry IDENTIFIER_REGISTRY(region); + IdentifierRegistry IDENTIFIER_REGISTRY(mapmode); ProvinceSet water_provinces; TerrainTypeManager PROPERTY_REF(terrain_type_manager); @@ -73,10 +73,7 @@ namespace OpenVic { StateManager PROPERTY_REF(state_manager); public: - Map(); - bool add_province(std::string_view identifier, colour_t colour); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_INDEX_OFFSET(province, 1) IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_CUSTOM_INDEX_OFFSET(province, 1); bool set_water_province(std::string_view identifier); @@ -95,11 +92,9 @@ namespace OpenVic { std::vector const& get_province_shape_image() const; bool add_region(std::string_view identifier, std::vector const& province_identifiers); - IDENTIFIER_REGISTRY_ACCESSORS(region) IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS(region) bool add_mapmode(std::string_view identifier, Mapmode::colour_func_t colour_func); - IDENTIFIER_REGISTRY_ACCESSORS(mapmode) /* The mapmode colour image contains of a list of base colours and stripe colours. Each colour is four bytes * in RGBA format, with the alpha value being used to interpolate with the terrain colour, so A = 0 is fully terrain diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp index e423938..0b98588 100644 --- a/src/openvic-simulation/map/Province.hpp +++ b/src/openvic-simulation/map/Province.hpp @@ -80,7 +80,7 @@ namespace OpenVic { Crime const* PROPERTY_RW(crime); // TODO - change this into a factory-like structure Good const* PROPERTY(rgo); - IdentifierRegistry buildings; + IdentifierRegistry IDENTIFIER_REGISTRY(building); std::vector PROPERTY(pops); Pop::pop_size_t PROPERTY(total_population); @@ -98,7 +98,6 @@ namespace OpenVic { bool load_positions(BuildingTypeManager const& building_type_manager, ast::NodeCPtr root); - IDENTIFIER_REGISTRY_ACCESSORS(building) bool expand_building(std::string_view building_type_identifier); bool load_pop_list(PopManager const& pop_manager, ast::NodeCPtr root); diff --git a/src/openvic-simulation/map/TerrainType.cpp b/src/openvic-simulation/map/TerrainType.cpp index 4134662..bab2a3c 100644 --- a/src/openvic-simulation/map/TerrainType.cpp +++ b/src/openvic-simulation/map/TerrainType.cpp @@ -16,9 +16,6 @@ TerrainTypeMapping::TerrainTypeMapping( ) : HasIdentifier { new_identifier }, type { new_type }, terrain_indices { std::move(new_terrain_indicies) }, priority { new_priority }, has_texture { new_has_texture } {} -TerrainTypeManager::TerrainTypeManager() - : terrain_types { "terrain types" }, terrain_type_mappings { "terrain type mappings" } {} - bool TerrainTypeManager::add_terrain_type( std::string_view identifier, colour_t colour, ModifierValue&& values, bool is_water ) { diff --git a/src/openvic-simulation/map/TerrainType.hpp b/src/openvic-simulation/map/TerrainType.hpp index 0fd5157..1a5b09c 100644 --- a/src/openvic-simulation/map/TerrainType.hpp +++ b/src/openvic-simulation/map/TerrainType.hpp @@ -41,8 +41,8 @@ namespace OpenVic { struct TerrainTypeManager { private: using terrain_type_mappings_map_t = std::map; - IdentifierRegistry terrain_types; - IdentifierRegistry terrain_type_mappings; + IdentifierRegistry IDENTIFIER_REGISTRY(terrain_type); + IdentifierRegistry IDENTIFIER_REGISTRY(terrain_type_mapping); terrain_type_mappings_map_t terrain_type_mappings_map; TerrainTypeMapping::index_t terrain_texture_limit = 0, terrain_texture_count = 0; @@ -51,16 +51,12 @@ namespace OpenVic { bool _load_terrain_type_mapping(std::string_view key, ast::NodeCPtr value); public: - TerrainTypeManager(); - bool add_terrain_type(std::string_view identifier, colour_t colour, ModifierValue&& values, bool is_water); - IDENTIFIER_REGISTRY_ACCESSORS(terrain_type) bool add_terrain_type_mapping( std::string_view identifier, TerrainType const* type, std::vector&& terrain_indicies, TerrainTypeMapping::index_t priority, bool has_texture ); - IDENTIFIER_REGISTRY_ACCESSORS(terrain_type_mapping) TerrainTypeMapping const* get_terrain_type_mapping_for(TerrainTypeMapping::index_t idx) const; diff --git a/src/openvic-simulation/military/Deployment.cpp b/src/openvic-simulation/military/Deployment.cpp index 0530986..da860ad 100644 --- a/src/openvic-simulation/military/Deployment.cpp +++ b/src/openvic-simulation/military/Deployment.cpp @@ -28,8 +28,6 @@ Deployment::Deployment( ) : HasIdentifier { new_path }, armies { std::move(new_armies) }, navies { std::move(new_navies) }, leaders { std::move(new_leaders) } {} -DeploymentManager::DeploymentManager() : deployments { "deployments" } {} - bool DeploymentManager::add_deployment( std::string_view path, std::vector&& armies, std::vector&& navies, std::vector&& leaders ) { diff --git a/src/openvic-simulation/military/Deployment.hpp b/src/openvic-simulation/military/Deployment.hpp index 597f727..2aef314 100644 --- a/src/openvic-simulation/military/Deployment.hpp +++ b/src/openvic-simulation/military/Deployment.hpp @@ -90,16 +90,13 @@ namespace OpenVic { struct DeploymentManager { private: - IdentifierInstanceRegistry deployments; + IdentifierInstanceRegistry IDENTIFIER_REGISTRY(deployment); string_set_t missing_oob_files; public: - DeploymentManager(); - bool add_deployment( std::string_view path, std::vector&& armies, std::vector&& navies, std::vector&& leaders ); - IDENTIFIER_REGISTRY_ACCESSORS(deployment) bool load_oob_file( GameManager const& game_manager, Dataloader const& dataloader, std::string_view history_path, diff --git a/src/openvic-simulation/military/LeaderTrait.cpp b/src/openvic-simulation/military/LeaderTrait.cpp index 46cd94a..978a3ed 100644 --- a/src/openvic-simulation/military/LeaderTrait.cpp +++ b/src/openvic-simulation/military/LeaderTrait.cpp @@ -14,8 +14,6 @@ bool LeaderTrait::is_background_trait() const { return trait_type == trait_type_t::BACKGROUND; } -LeaderTraitManager::LeaderTraitManager() : leader_traits { "leader trait" } {} - bool LeaderTraitManager::add_leader_trait( std::string_view identifier, LeaderTrait::trait_type_t type, ModifierValue&& modifiers ) { diff --git a/src/openvic-simulation/military/LeaderTrait.hpp b/src/openvic-simulation/military/LeaderTrait.hpp index 4ec3b63..0d84814 100644 --- a/src/openvic-simulation/military/LeaderTrait.hpp +++ b/src/openvic-simulation/military/LeaderTrait.hpp @@ -43,16 +43,13 @@ namespace OpenVic { struct LeaderTraitManager { private: - IdentifierRegistry leader_traits; + IdentifierRegistry IDENTIFIER_REGISTRY(leader_trait); static inline const string_set_t allowed_modifiers = { "attack", "defence", "morale", "organisation", "reconnaissance", "speed", "attrition", "experience", "reliability" }; public: - LeaderTraitManager(); - bool add_leader_trait(std::string_view identifier, LeaderTrait::trait_type_t type, ModifierValue&& modifiers); - IDENTIFIER_REGISTRY_ACCESSORS(leader_trait) bool load_leader_traits_file(ModifierManager const& modifier_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/military/Unit.cpp b/src/openvic-simulation/military/Unit.cpp index ed3d37b..01c6f84 100644 --- a/src/openvic-simulation/military/Unit.cpp +++ b/src/openvic-simulation/military/Unit.cpp @@ -39,8 +39,6 @@ NavalUnit::NavalUnit( supply_consumption_score { supply_consumption_score }, hull { hull }, gun_power { gun_power }, fire_range { fire_range }, evasion { evasion }, torpedo_attack { torpedo_attack } {}; -UnitManager::UnitManager() : units { "units" } {} - bool UnitManager::_check_shared_parameters(std::string_view identifier, UNIT_PARAMS) { if (identifier.empty()) { Logger::error("Invalid religion identifier - empty!"); diff --git a/src/openvic-simulation/military/Unit.hpp b/src/openvic-simulation/military/Unit.hpp index 17228ce..6e3a6e4 100644 --- a/src/openvic-simulation/military/Unit.hpp +++ b/src/openvic-simulation/military/Unit.hpp @@ -111,16 +111,13 @@ namespace OpenVic { struct UnitManager { private: - IdentifierRegistry units; + IdentifierRegistry IDENTIFIER_REGISTRY(unit); bool _check_shared_parameters(std::string_view identifier, UNIT_PARAMS); public: - UnitManager(); - bool add_land_unit(std::string_view identifier, UNIT_PARAMS, LAND_PARAMS); bool add_naval_unit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS); - IDENTIFIER_REGISTRY_ACCESSORS(unit) static NodeTools::callback_t expect_type_str(NodeTools::Callback auto callback); diff --git a/src/openvic-simulation/military/Wargoal.cpp b/src/openvic-simulation/military/Wargoal.cpp index 4a00c38..7a12b7e 100644 --- a/src/openvic-simulation/military/Wargoal.cpp +++ b/src/openvic-simulation/military/Wargoal.cpp @@ -33,8 +33,6 @@ WargoalType::WargoalType( modifiers { std::move(new_modifiers) }, peace_options { new_peace_options } {} -WargoalTypeManager::WargoalTypeManager() : wargoal_types { "wargoal types" } {} - const std::vector& WargoalTypeManager::get_peace_priority_list() const { return peace_priorities; } diff --git a/src/openvic-simulation/military/Wargoal.hpp b/src/openvic-simulation/military/Wargoal.hpp index f696511..66fce90 100644 --- a/src/openvic-simulation/military/Wargoal.hpp +++ b/src/openvic-simulation/military/Wargoal.hpp @@ -87,12 +87,10 @@ namespace OpenVic { struct WargoalTypeManager { private: - IdentifierRegistry wargoal_types; + IdentifierRegistry IDENTIFIER_REGISTRY(wargoal_type); std::vector PROPERTY(peace_priorities); public: - WargoalTypeManager(); - const std::vector& get_peace_priority_list() const; bool add_wargoal_type( @@ -110,7 +108,6 @@ namespace OpenVic { WargoalType::peace_modifiers_t&& modifiers, peace_options_t peace_options ); - IDENTIFIER_REGISTRY_ACCESSORS(wargoal_type) bool load_wargoal_file(ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/misc/Decision.cpp b/src/openvic-simulation/misc/Decision.cpp index 861a584..9200688 100644 --- a/src/openvic-simulation/misc/Decision.cpp +++ b/src/openvic-simulation/misc/Decision.cpp @@ -12,8 +12,6 @@ Decision::Decision( news_desc_long { new_news_desc_long }, news_desc_medium { new_news_desc_medium }, news_desc_short { new_news_desc_short }, picture { new_picture } {} -DecisionManager::DecisionManager() : decisions { "decisions" } {} - bool DecisionManager::add_decision( std::string_view identifier, bool alert, bool news, std::string_view news_title, std::string_view news_desc_long, std::string_view news_desc_medium, diff --git a/src/openvic-simulation/misc/Decision.hpp b/src/openvic-simulation/misc/Decision.hpp index e477f64..452512d 100644 --- a/src/openvic-simulation/misc/Decision.hpp +++ b/src/openvic-simulation/misc/Decision.hpp @@ -30,17 +30,14 @@ namespace OpenVic { struct DecisionManager { private: - IdentifierRegistry decisions; + IdentifierRegistry IDENTIFIER_REGISTRY(decision); public: - DecisionManager(); - bool add_decision( std::string_view identifier, bool alert, bool news, std::string_view news_title, std::string_view news_desc_long, std::string_view news_desc_medium, std::string_view news_desc_short, std::string_view picture ); - IDENTIFIER_REGISTRY_ACCESSORS(decision) bool load_decision_file(ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/misc/Define.cpp b/src/openvic-simulation/misc/Define.cpp index 9e468d9..45584f7 100644 --- a/src/openvic-simulation/misc/Define.cpp +++ b/src/openvic-simulation/misc/Define.cpp @@ -29,8 +29,6 @@ uint64_t Define::get_value_as_uint() const { return std::strtoull(value.data(), nullptr, 10); } -DefineManager::DefineManager() : defines { "defines" } {} - bool DefineManager::add_define(std::string_view name, std::string&& value, Define::Type type) { return defines.add_item({ name, std::move(value), type }, duplicate_warning_callback); } diff --git a/src/openvic-simulation/misc/Define.hpp b/src/openvic-simulation/misc/Define.hpp index 46e4836..c3c7888 100644 --- a/src/openvic-simulation/misc/Define.hpp +++ b/src/openvic-simulation/misc/Define.hpp @@ -30,17 +30,14 @@ namespace OpenVic { struct DefineManager { private: - IdentifierRegistry defines; + IdentifierRegistry IDENTIFIER_REGISTRY(define); std::optional start_date; std::optional end_date; public: - DefineManager(); - bool add_define(std::string_view name, std::string&& value, Define::Type type); bool add_date_define(std::string_view name, Date date); - IDENTIFIER_REGISTRY_ACCESSORS(define) Date get_start_date() const; Date get_end_date() const; diff --git a/src/openvic-simulation/misc/Event.cpp b/src/openvic-simulation/misc/Event.cpp index 029336c..59b1f54 100644 --- a/src/openvic-simulation/misc/Event.cpp +++ b/src/openvic-simulation/misc/Event.cpp @@ -20,8 +20,6 @@ Event::Event( news_desc_long { new_news_desc_long }, news_desc_medium { new_news_desc_medium }, news_desc_short { new_news_desc_short }, election { new_election }, election_issue_group { new_election_issue_group }, options { std::move(new_options) } {} -EventManager::EventManager() : events { "events" } {} - bool EventManager::register_event( std::string_view identifier, std::string_view title, std::string_view description, std::string_view image, Event::event_type_t type, bool triggered_only, bool major, bool fire_only_once, bool allows_multiple_instances, bool news, diff --git a/src/openvic-simulation/misc/Event.hpp b/src/openvic-simulation/misc/Event.hpp index 6d0829e..d1f7963 100644 --- a/src/openvic-simulation/misc/Event.hpp +++ b/src/openvic-simulation/misc/Event.hpp @@ -65,11 +65,9 @@ namespace OpenVic { struct EventManager { private: - IdentifierRegistry events; + IdentifierRegistry IDENTIFIER_REGISTRY(event); public: - EventManager(); - bool register_event( std::string_view identifier, std::string_view title, std::string_view description, std::string_view image, Event::event_type_t type, bool triggered_only, bool major, bool fire_only_once, bool allows_multiple_instances, @@ -77,7 +75,6 @@ namespace OpenVic { std::string_view news_desc_short, bool election, IssueGroup const* election_issue_group, std::vector&& options ); - IDENTIFIER_REGISTRY_ACCESSORS(event); bool load_event_file(IssueManager const& issue_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/misc/Modifier.cpp b/src/openvic-simulation/misc/Modifier.cpp index 1b3e551..ac052c2 100644 --- a/src/openvic-simulation/misc/Modifier.cpp +++ b/src/openvic-simulation/misc/Modifier.cpp @@ -84,10 +84,6 @@ TriggeredModifier::TriggeredModifier(std::string_view new_identifier, ModifierVa ModifierInstance::ModifierInstance(Modifier const& modifier, Date expiry_date) : modifier { modifier }, expiry_date { expiry_date } {} -ModifierManager::ModifierManager() - : modifier_effects { "modifier effects" }, event_modifiers { "event modifiers" }, static_modifiers { "static modifiers" }, - triggered_modifiers { "triggered modifiers" } {} - bool ModifierManager::add_modifier_effect(std::string_view identifier, bool positive_good, ModifierEffect::format_t format) { if (identifier.empty()) { Logger::error("Invalid modifier effect identifier - empty!"); diff --git a/src/openvic-simulation/misc/Modifier.hpp b/src/openvic-simulation/misc/Modifier.hpp index 617159a..a176d6c 100644 --- a/src/openvic-simulation/misc/Modifier.hpp +++ b/src/openvic-simulation/misc/Modifier.hpp @@ -110,12 +110,12 @@ namespace OpenVic { * so instead we use an IdentifierInstanceRegistry (using std::unique_ptr's under the hood). */ private: - IdentifierInstanceRegistry modifier_effects; + IdentifierInstanceRegistry IDENTIFIER_REGISTRY(modifier_effect); string_set_t complex_modifiers; - IdentifierRegistry event_modifiers; - IdentifierRegistry static_modifiers; - IdentifierRegistry triggered_modifiers; + IdentifierRegistry IDENTIFIER_REGISTRY(event_modifier); + IdentifierRegistry IDENTIFIER_REGISTRY(static_modifier); + IdentifierRegistry IDENTIFIER_REGISTRY(triggered_modifier); /* effect_validator takes in ModifierEffect const& */ NodeTools::key_value_callback_t _modifier_effect_callback( @@ -124,28 +124,22 @@ namespace OpenVic { ) const; public: - ModifierManager(); - bool add_modifier_effect( std::string_view identifier, bool positive_good, ModifierEffect::format_t format = ModifierEffect::format_t::PROPORTION_DECIMAL ); - IDENTIFIER_REGISTRY_ACCESSORS(modifier_effect) void register_complex_modifier(std::string_view identifier); bool setup_modifier_effects(); bool add_event_modifier(std::string_view identifier, ModifierValue&& values, Modifier::icon_t icon); - IDENTIFIER_REGISTRY_ACCESSORS(event_modifier) bool load_event_modifiers(ast::NodeCPtr root); bool add_static_modifier(std::string_view identifier, ModifierValue&& values); - IDENTIFIER_REGISTRY_ACCESSORS(static_modifier) bool load_static_modifiers(ast::NodeCPtr root); bool add_triggered_modifier(std::string_view identifier, ModifierValue&& values, Modifier::icon_t icon); - IDENTIFIER_REGISTRY_ACCESSORS(triggered_modifier) bool load_triggered_modifiers(ast::NodeCPtr root); NodeTools::node_callback_t expect_validated_modifier_value_and_default( diff --git a/src/openvic-simulation/politics/Government.cpp b/src/openvic-simulation/politics/Government.cpp index b18432c..a226518 100644 --- a/src/openvic-simulation/politics/Government.cpp +++ b/src/openvic-simulation/politics/Government.cpp @@ -1,7 +1,5 @@ #include "Government.hpp" -#include "openvic-simulation/GameManager.hpp" - using namespace OpenVic; using namespace OpenVic::NodeTools; @@ -16,8 +14,6 @@ bool GovernmentType::is_ideology_compatible(Ideology const* ideology) const { return std::find(ideologies.begin(), ideologies.end(), ideology) != ideologies.end(); } -GovernmentTypeManager::GovernmentTypeManager() : government_types { "government types" } {} - bool GovernmentTypeManager::add_government_type( std::string_view identifier, std::vector&& ideologies, bool elections, bool appoint_ruling_party, Timespan term_duration, std::string_view flag_type diff --git a/src/openvic-simulation/politics/Government.hpp b/src/openvic-simulation/politics/Government.hpp index 025e238..4682bbf 100644 --- a/src/openvic-simulation/politics/Government.hpp +++ b/src/openvic-simulation/politics/Government.hpp @@ -28,17 +28,14 @@ namespace OpenVic { struct GovernmentTypeManager { private: - IdentifierRegistry government_types; + IdentifierRegistry IDENTIFIER_REGISTRY(government_type); std::vector PROPERTY(flag_types); public: - GovernmentTypeManager(); - bool add_government_type( std::string_view identifier, std::vector&& ideologies, bool elections, bool appoint_ruling_party, Timespan term_duration, std::string_view flag_type ); - IDENTIFIER_REGISTRY_ACCESSORS(government_type) bool load_government_types_file(IdeologyManager const& ideology_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/politics/Ideology.cpp b/src/openvic-simulation/politics/Ideology.cpp index 569f834..fd5005d 100644 --- a/src/openvic-simulation/politics/Ideology.cpp +++ b/src/openvic-simulation/politics/Ideology.cpp @@ -11,8 +11,6 @@ Ideology::Ideology( ) : HasIdentifierAndColour { new_identifier, new_colour, false, false }, group { new_group }, uncivilised { new_uncivilised }, can_reduce_militancy { new_can_reduce_militancy }, spawn_date { new_spawn_date } {} -IdeologyManager::IdeologyManager() : ideology_groups { "ideology groups" }, ideologies { "ideologies" } {} - bool IdeologyManager::add_ideology_group(std::string_view identifier) { if (identifier.empty()) { Logger::error("Invalid ideology group identifier - empty!"); diff --git a/src/openvic-simulation/politics/Ideology.hpp b/src/openvic-simulation/politics/Ideology.hpp index dd3f07a..8039dbd 100644 --- a/src/openvic-simulation/politics/Ideology.hpp +++ b/src/openvic-simulation/politics/Ideology.hpp @@ -37,20 +37,16 @@ namespace OpenVic { struct IdeologyManager { private: - IdentifierRegistry ideology_groups; - IdentifierRegistry ideologies; + IdentifierRegistry IDENTIFIER_REGISTRY(ideology_group); + IdentifierRegistry IDENTIFIER_REGISTRY_CUSTOM_PLURAL(ideology, ideologies); public: - IdeologyManager(); - bool add_ideology_group(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(ideology_group) bool add_ideology( std::string_view identifier, colour_t colour, IdeologyGroup const* group, bool uncivilised, bool can_reduce_militancy, Date spawn_date ); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(ideology, ideologies) bool load_ideology_file(ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/politics/Issue.cpp b/src/openvic-simulation/politics/Issue.cpp index 9164831..ad37ac6 100644 --- a/src/openvic-simulation/politics/Issue.cpp +++ b/src/openvic-simulation/politics/Issue.cpp @@ -16,10 +16,6 @@ ReformGroup::ReformGroup(std::string_view identifier, ReformType const& type, bo Reform::Reform(std::string_view identifier, ReformGroup const& group, size_t ordinal) : Issue { identifier, group }, ordinal { ordinal }, reform_group { group } {} -IssueManager::IssueManager() - : issue_groups { "issue groups" }, issues { "issues" }, reform_types { "reform types" }, reform_groups { "reform groups" }, - reforms { "reforms" } {} - bool IssueManager::add_issue_group(std::string_view identifier) { if (identifier.empty()) { Logger::error("Invalid issue group identifier - empty!"); diff --git a/src/openvic-simulation/politics/Issue.hpp b/src/openvic-simulation/politics/Issue.hpp index e9d154f..0b3d4d3 100644 --- a/src/openvic-simulation/politics/Issue.hpp +++ b/src/openvic-simulation/politics/Issue.hpp @@ -84,11 +84,11 @@ namespace OpenVic { // Issue manager - holds the registries struct IssueManager { private: - IdentifierRegistry issue_groups; - IdentifierRegistry issues; - IdentifierRegistry reform_types; - IdentifierRegistry reform_groups; - IdentifierRegistry reforms; + IdentifierRegistry IDENTIFIER_REGISTRY(issue_group); + IdentifierRegistry IDENTIFIER_REGISTRY(issue); + IdentifierRegistry IDENTIFIER_REGISTRY(reform_type); + IdentifierRegistry IDENTIFIER_REGISTRY(reform_group); + IdentifierRegistry IDENTIFIER_REGISTRY(reform); bool _load_issue_group(size_t& expected_issues, std::string_view identifier, ast::NodeCPtr node); bool _load_issue(std::string_view identifier, IssueGroup const* group, ast::NodeCPtr node); @@ -98,22 +98,15 @@ namespace OpenVic { bool _load_reform(size_t& ordinal, std::string_view identifier, ReformGroup const* group, ast::NodeCPtr node); public: - IssueManager(); - bool add_issue_group(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(issue_group) bool add_issue(std::string_view identifier, IssueGroup const* group); - IDENTIFIER_REGISTRY_ACCESSORS(issue) bool add_reform_type(std::string_view identifier, bool uncivilised); - IDENTIFIER_REGISTRY_ACCESSORS(reform_type) bool add_reform_group(std::string_view identifier, ReformType const* type, bool ordered, bool administrative); - IDENTIFIER_REGISTRY_ACCESSORS(reform_group) bool add_reform(std::string_view identifier, ReformGroup const* group, size_t ordinal); - IDENTIFIER_REGISTRY_ACCESSORS(reform) bool load_issues_file(ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/politics/NationalFocus.cpp b/src/openvic-simulation/politics/NationalFocus.cpp index 6f25c3e..a2003eb 100644 --- a/src/openvic-simulation/politics/NationalFocus.cpp +++ b/src/openvic-simulation/politics/NationalFocus.cpp @@ -23,8 +23,6 @@ NationalFocus::NationalFocus( encouraged_loyalty { std::move(new_encouraged_loyalty) }, encouraged_production { std::move(new_encouraged_production) } {} -NationalFocusManager::NationalFocusManager() : national_focus_groups { "national focus groups" }, national_foci { "national foci" } {} - inline bool NationalFocusManager::add_national_focus_group(std::string_view identifier) { if (identifier.empty()) { Logger::error("No identifier for national focus group!"); diff --git a/src/openvic-simulation/politics/NationalFocus.hpp b/src/openvic-simulation/politics/NationalFocus.hpp index abf6deb..0fe0ddc 100644 --- a/src/openvic-simulation/politics/NationalFocus.hpp +++ b/src/openvic-simulation/politics/NationalFocus.hpp @@ -51,14 +51,11 @@ namespace OpenVic { struct NationalFocusManager { private: - IdentifierRegistry national_focus_groups; - IdentifierRegistry national_foci; + IdentifierRegistry IDENTIFIER_REGISTRY(national_focus_group); + IdentifierRegistry IDENTIFIER_REGISTRY_CUSTOM_PLURAL(national_focus, national_foci); public: - NationalFocusManager(); - inline bool add_national_focus_group(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(national_focus_group) inline bool add_national_focus( std::string_view identifier, @@ -69,7 +66,6 @@ namespace OpenVic { NationalFocus::party_loyalty_map_t&& encouraged_loyalty, NationalFocus::production_map_t&& encouraged_production ); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(national_focus, national_foci) bool load_national_foci_file(PopManager const& pop_manager, IdeologyManager const& ideology_manager, GoodManager const& good_manager, ModifierManager const& modifier_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/politics/NationalValue.cpp b/src/openvic-simulation/politics/NationalValue.cpp index 3760eec..57c5652 100644 --- a/src/openvic-simulation/politics/NationalValue.cpp +++ b/src/openvic-simulation/politics/NationalValue.cpp @@ -6,8 +6,6 @@ using namespace OpenVic::NodeTools; NationalValue::NationalValue(std::string_view new_identifier, ModifierValue&& new_modifiers) : HasIdentifier { new_identifier }, modifiers { std::move(new_modifiers) } {} -NationalValueManager::NationalValueManager() : national_values { "national values" } {} - bool NationalValueManager::add_national_value(std::string_view identifier, ModifierValue&& modifiers) { if (identifier.empty()) { Logger::error("Invalid national value identifier - empty!"); diff --git a/src/openvic-simulation/politics/NationalValue.hpp b/src/openvic-simulation/politics/NationalValue.hpp index 824da7e..3b92f4d 100644 --- a/src/openvic-simulation/politics/NationalValue.hpp +++ b/src/openvic-simulation/politics/NationalValue.hpp @@ -20,13 +20,10 @@ namespace OpenVic { struct NationalValueManager { private: - IdentifierRegistry national_values; + IdentifierRegistry IDENTIFIER_REGISTRY(national_value); public: - NationalValueManager(); - bool add_national_value(std::string_view identifier, ModifierValue&& modifiers); - IDENTIFIER_REGISTRY_ACCESSORS(national_value) bool load_national_values_file(ModifierManager const& modifier_manager, ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/politics/Rebel.cpp b/src/openvic-simulation/politics/Rebel.cpp index ec39c9e..a00b4a8 100644 --- a/src/openvic-simulation/politics/Rebel.cpp +++ b/src/openvic-simulation/politics/Rebel.cpp @@ -16,8 +16,6 @@ RebelType::RebelType( allow_all_ideologies { allow_all_ideologies }, resilient { resilient }, reinforcing { reinforcing }, general { general }, smart { smart }, unit_transfer { unit_transfer }, occupation_mult { occupation_mult } {} -RebelManager::RebelManager() : rebel_types { "rebel types" } {} - bool RebelManager::add_rebel_type( std::string_view new_identifier, RebelType::icon_t icon, RebelType::area_t area, bool break_alliance_on_win, RebelType::government_map_t&& desired_governments, RebelType::defection_t defection, diff --git a/src/openvic-simulation/politics/Rebel.hpp b/src/openvic-simulation/politics/Rebel.hpp index ba7b33f..c0fc9ff 100644 --- a/src/openvic-simulation/politics/Rebel.hpp +++ b/src/openvic-simulation/politics/Rebel.hpp @@ -65,12 +65,9 @@ namespace OpenVic { struct RebelManager { private: - IdentifierRegistry rebel_types; + IdentifierRegistry IDENTIFIER_REGISTRY(rebel_type); public: - RebelManager(); - - IDENTIFIER_REGISTRY_ACCESSORS(rebel_type) bool add_rebel_type( std::string_view new_identifier, RebelType::icon_t icon, RebelType::area_t area, bool break_alliance_on_win, RebelType::government_map_t&& desired_governments, RebelType::defection_t defection, diff --git a/src/openvic-simulation/pop/Culture.cpp b/src/openvic-simulation/pop/Culture.cpp index faf05d3..ee8ffd6 100644 --- a/src/openvic-simulation/pop/Culture.cpp +++ b/src/openvic-simulation/pop/Culture.cpp @@ -19,9 +19,6 @@ Culture::Culture( ) : HasIdentifierAndColour { new_identifier, new_colour, false, false }, group { new_group }, first_names { std::move(new_first_names) }, last_names { std::move(new_last_names) } {} -CultureManager::CultureManager() - : graphical_culture_types { "graphical culture types" }, culture_groups { "culture groups" }, cultures { "cultures" } {} - bool CultureManager::add_graphical_culture_type(std::string_view identifier) { if (identifier.empty()) { Logger::error("Invalid culture group identifier - empty!"); diff --git a/src/openvic-simulation/pop/Culture.hpp b/src/openvic-simulation/pop/Culture.hpp index ff5f7c5..1c6b75f 100644 --- a/src/openvic-simulation/pop/Culture.hpp +++ b/src/openvic-simulation/pop/Culture.hpp @@ -56,9 +56,9 @@ namespace OpenVic { struct CultureManager { private: - IdentifierRegistry graphical_culture_types; - IdentifierRegistry culture_groups; - IdentifierRegistry cultures; + IdentifierRegistry IDENTIFIER_REGISTRY(graphical_culture_type); + IdentifierRegistry IDENTIFIER_REGISTRY(culture_group); + IdentifierRegistry IDENTIFIER_REGISTRY(culture); bool _load_culture_group( size_t& total_expected_cultures, GraphicalCultureType const* default_unit_graphical_culture_type, @@ -67,22 +67,17 @@ namespace OpenVic { bool _load_culture(CultureGroup const& culture_group, std::string_view culture_key, ast::NodeCPtr node); public: - CultureManager(); - bool add_graphical_culture_type(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(graphical_culture_type) bool add_culture_group( std::string_view identifier, std::string_view leader, GraphicalCultureType const* graphical_culture_type, bool is_overseas ); - IDENTIFIER_REGISTRY_ACCESSORS(culture_group) bool add_culture( std::string_view identifier, colour_t colour, CultureGroup const& group, std::vector&& first_names, std::vector&& last_names ); - IDENTIFIER_REGISTRY_ACCESSORS(culture) bool load_graphical_culture_type_file(ast::NodeCPtr root); bool load_culture_file(ast::NodeCPtr root); diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp index 4d87081..cf54c2b 100644 --- a/src/openvic-simulation/pop/Pop.cpp +++ b/src/openvic-simulation/pop/Pop.cpp @@ -40,7 +40,7 @@ PopType::PopType( assert(merge_max_size >= 0); } -PopManager::PopManager() : pop_types { "pop types" }, slave_sprite { 0 }, administrative_sprite { 0 } {} +PopManager::PopManager() : slave_sprite { 0 }, administrative_sprite { 0 } {} bool PopManager::add_pop_type( std::string_view identifier, colour_t colour, PopType::strata_t strata, PopType::sprite_t sprite, diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp index fb51c59..736b77d 100644 --- a/src/openvic-simulation/pop/Pop.hpp +++ b/src/openvic-simulation/pop/Pop.hpp @@ -89,7 +89,7 @@ namespace OpenVic { struct PopManager { private: - IdentifierRegistry pop_types; + IdentifierRegistry IDENTIFIER_REGISTRY(pop_type); PopType::sprite_t PROPERTY(slave_sprite); PopType::sprite_t PROPERTY(administrative_sprite); @@ -107,7 +107,6 @@ namespace OpenVic { bool can_be_recruited, bool can_reduce_consciousness, bool administrative_efficiency, bool can_build, bool factory, bool can_work_factory, bool unemployment ); - IDENTIFIER_REGISTRY_ACCESSORS(pop_type) bool load_pop_type_file( std::string_view filestem, UnitManager const& unit_manager, GoodManager const& good_manager, ast::NodeCPtr root diff --git a/src/openvic-simulation/pop/Religion.cpp b/src/openvic-simulation/pop/Religion.cpp index 644618d..a5e9faf 100644 --- a/src/openvic-simulation/pop/Religion.cpp +++ b/src/openvic-simulation/pop/Religion.cpp @@ -14,8 +14,6 @@ Religion::Religion( assert(icon > 0); } -ReligionManager::ReligionManager() : religion_groups { "religion groups" }, religions { "religions" } {} - bool ReligionManager::add_religion_group(std::string_view identifier) { if (identifier.empty()) { Logger::error("Invalid religion group identifier - empty!"); diff --git a/src/openvic-simulation/pop/Religion.hpp b/src/openvic-simulation/pop/Religion.hpp index 6f34eee..14c2f57 100644 --- a/src/openvic-simulation/pop/Religion.hpp +++ b/src/openvic-simulation/pop/Religion.hpp @@ -38,19 +38,15 @@ namespace OpenVic { struct ReligionManager { private: - IdentifierRegistry religion_groups; - IdentifierRegistry religions; + IdentifierRegistry IDENTIFIER_REGISTRY(religion_group); + IdentifierRegistry IDENTIFIER_REGISTRY(religion); public: - ReligionManager(); - bool add_religion_group(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(religion_group) bool add_religion( std::string_view identifier, colour_t colour, ReligionGroup const& group, Religion::icon_t icon, bool pagan ); - IDENTIFIER_REGISTRY_ACCESSORS(religion) bool load_religion_file(ast::NodeCPtr root); }; diff --git a/src/openvic-simulation/research/Invention.cpp b/src/openvic-simulation/research/Invention.cpp index 381a249..f9f3f7b 100644 --- a/src/openvic-simulation/research/Invention.cpp +++ b/src/openvic-simulation/research/Invention.cpp @@ -16,8 +16,6 @@ Invention::Invention( enabled_crimes { std::move(new_enabled_crimes) }, unlock_gas_attack { new_unlock_gas_attack }, unlock_gas_defence { new_unlock_gas_defence } {} //TODO icon -InventionManager::InventionManager() : inventions { "inventions" } {} - bool InventionManager::add_invention( std::string_view identifier, ModifierValue&& values, bool news, Invention::unit_set_t&& activated_units, Invention::building_set_t&& activated_buildings, Invention::crime_set_t&& enabled_crimes, diff --git a/src/openvic-simulation/research/Invention.hpp b/src/openvic-simulation/research/Invention.hpp index dc4256e..a8ce96d 100644 --- a/src/openvic-simulation/research/Invention.hpp +++ b/src/openvic-simulation/research/Invention.hpp @@ -38,19 +38,15 @@ namespace OpenVic { }; struct InventionManager { - IdentifierRegistry inventions; + IdentifierRegistry IDENTIFIER_REGISTRY(invention); public: - InventionManager(); - bool add_invention( std::string_view identifier, ModifierValue&& values, bool news, Invention::unit_set_t&& activated_units, Invention::building_set_t&& activated_buildings, Invention::crime_set_t&& enabled_crimes, bool unlock_gas_attack, bool unlock_gas_defence ); - IDENTIFIER_REGISTRY_ACCESSORS(invention) - bool load_inventions_file( ModifierManager const& modifier_manager, UnitManager const& unit_manager, BuildingTypeManager const& building_type_manager, CrimeManager const& crime_manager, ast::NodeCPtr root diff --git a/src/openvic-simulation/research/Technology.cpp b/src/openvic-simulation/research/Technology.cpp index f8ebb4b..3ba3624 100644 --- a/src/openvic-simulation/research/Technology.cpp +++ b/src/openvic-simulation/research/Technology.cpp @@ -19,10 +19,6 @@ Technology::Technology( TechnologySchool::TechnologySchool(std::string_view new_identifier, ModifierValue&& new_values) : Modifier { new_identifier, std::move(new_values), 0 } {} -TechnologyManager::TechnologyManager() - : technology_folders { "technology folders" }, technology_areas { "technology areas" }, technologies { "technologies" }, - technology_schools { "technology schools" } {} - bool TechnologyManager::add_technology_folder(std::string_view identifier) { if (identifier.empty()) { Logger::error("Invalid technology folder identifier - empty!"); diff --git a/src/openvic-simulation/research/Technology.hpp b/src/openvic-simulation/research/Technology.hpp index 52db87e..8489e9b 100644 --- a/src/openvic-simulation/research/Technology.hpp +++ b/src/openvic-simulation/research/Technology.hpp @@ -64,28 +64,22 @@ namespace OpenVic { }; struct TechnologyManager { - IdentifierRegistry technology_folders; - IdentifierRegistry technology_areas; - IdentifierRegistry technologies; - IdentifierRegistry technology_schools; + IdentifierRegistry IDENTIFIER_REGISTRY(technology_folder); + IdentifierRegistry IDENTIFIER_REGISTRY(technology_area); + IdentifierRegistry IDENTIFIER_REGISTRY_CUSTOM_PLURAL(technology, technologies); + IdentifierRegistry IDENTIFIER_REGISTRY(technology_school); public: - TechnologyManager(); - bool add_technology_folder(std::string_view identifier); - IDENTIFIER_REGISTRY_ACCESSORS(technology_folder) bool add_technology_area(std::string_view identifier, TechnologyFolder const* folder); - IDENTIFIER_REGISTRY_ACCESSORS(technology_area) bool add_technology( std::string_view identifier, TechnologyArea const* area, Date::year_t year, fixed_point_t cost, bool unciv_military, uint8_t unit, Technology::unit_set_t&& activated_units, Technology::building_set_t&& activated_buildings, ModifierValue&& values); - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(technology, technologies) bool add_technology_school(std::string_view identifier, ModifierValue&& values); - IDENTIFIER_REGISTRY_ACCESSORS(technology_school) bool load_technology_file_areas(ast::NodeCPtr root); // common/technology.txt bool load_technology_file_schools(ModifierManager const& modifier_manager, ast::NodeCPtr root); // also common/technology.txt diff --git a/src/openvic-simulation/types/IdentifierRegistry.hpp b/src/openvic-simulation/types/IdentifierRegistry.hpp index cfb4fed..3bf52e1 100644 --- a/src/openvic-simulation/types/IdentifierRegistry.hpp +++ b/src/openvic-simulation/types/IdentifierRegistry.hpp @@ -315,98 +315,83 @@ namespace OpenVic { template _Type> using IdentifierInstanceRegistry = InstanceRegistry<_Type, _get_identifier<_Type>>; -/* Member functions for const access to a UniqueKeyRegistry member variable. */ -#define IDENTIFIER_REGISTRY_ACCESSORS(name) \ - IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(name, name##s) +/* Macros to generate declaration and constant accessor methods for a UniqueKeyRegistry member variable. */ -#define IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_PLURAL(singular, plural) \ - IDENTIFIER_REGISTRY_ACCESSORS_FULL_CUSTOM(singular, plural, plural, 0) +#define IDENTIFIER_REGISTRY(name) \ + IDENTIFIER_REGISTRY_CUSTOM_PLURAL(name, name##s) -#define IDENTIFIER_REGISTRY_ACCESSORS_CUSTOM_INDEX_OFFSET(name, index_offset) \ - IDENTIFIER_REGISTRY_ACCESSORS_FULL_CUSTOM(name, name##s, name##s, index_offset) +#define IDENTIFIER_REGISTRY_CUSTOM_PLURAL(singular, plural) \ + IDENTIFIER_REGISTRY_FULL_CUSTOM(singular, plural, plural, plural, 0) -#define IDENTIFIER_REGISTRY_ACCESSORS_FULL_CUSTOM(singular, plural, registry, index_offset) \ +#define IDENTIFIER_REGISTRY_CUSTOM_INDEX_OFFSET(name, index_offset) \ + IDENTIFIER_REGISTRY_FULL_CUSTOM(name, name##s, name##s, name##s, index_offset) + +#define IDENTIFIER_REGISTRY_FULL_CUSTOM(singular, plural, registry, debug_name, index_offset) \ + registry { #debug_name };\ +public: \ void lock_##plural() { \ registry.lock(); \ } \ bool plural##_are_locked() const { \ return registry.is_locked(); \ } \ - decltype(registry)::value_type const* get_##singular##_by_identifier(std::string_view identifier) const { \ - return registry.get_item_by_identifier(identifier); \ - } \ bool has_##singular##_identifier(std::string_view identifier) const { \ return registry.has_identifier(identifier); \ } \ - decltype(registry)::value_type const* get_##singular##_by_index(size_t index) const { \ - return index >= index_offset ? registry.get_item_by_index(index - index_offset) : nullptr; \ - } \ size_t get_##singular##_count() const { \ return registry.size(); \ } \ bool plural##_empty() const { \ return registry.empty(); \ } \ - std::vector const& get_##plural() const { \ - return registry.get_items(); \ - } \ std::vector get_##singular##_identifiers() const { \ return registry.get_item_identifiers(); \ } \ - NodeTools::callback_t expect_##singular##_str( \ - NodeTools::callback_t callback, bool warn = false \ - ) const { \ - return registry.expect_item_str(callback, warn); \ - } \ - NodeTools::node_callback_t expect_##singular##_identifier( \ - NodeTools::callback_t callback, bool warn = false \ - ) const { \ - return registry.expect_item_identifier(callback, warn); \ - } \ - NodeTools::node_callback_t expect_##singular##_dictionary( \ - NodeTools::callback_t callback \ - ) const { \ - return registry.expect_item_dictionary(callback); \ - } \ NodeTools::node_callback_t expect_##singular##_decimal_map( \ NodeTools::callback_t&&> callback \ ) const { \ return registry.expect_item_decimal_map(callback); \ - } + } \ + IDENTIFIER_REGISTRY_INTERNAL_SHARED(singular, plural, registry, index_offset, const) \ +private: + +/* Macros to generate non-constant accessor methods for a UniqueKeyRegistry member variable. */ -/* Member functions for non-const access to a UniqueKeyRegistry member variable. */ #define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS(name) \ IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_CUSTOM_PLURAL(name, name##s) #define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_CUSTOM_PLURAL(singular, plural) \ - IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(single, plural, plural, 0) + IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(singular, plural, plural, plural, 0) #define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_CUSTOM_INDEX_OFFSET(name, index_offset) \ - IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(name, name##s, name##s, index_offset) + IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(name, name##s, name##s, name##s, index_offset) + +#define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(singular, plural, registry, debug_name, index_offset) \ + IDENTIFIER_REGISTRY_INTERNAL_SHARED(singular, plural, registry, index_offset,) -#define IDENTIFIER_REGISTRY_NON_CONST_ACCESSORS_FULL_CUSTOM(singular, plural, registry, index_offset) \ - decltype(registry)::value_type* get_##singular##_by_identifier(std::string_view identifier) { \ +#define IDENTIFIER_REGISTRY_INTERNAL_SHARED(singular, plural, registry, index_offset, const_kw) \ + decltype(registry)::value_type const_kw* get_##singular##_by_identifier(std::string_view identifier) const_kw { \ return registry.get_item_by_identifier(identifier); \ } \ - decltype(registry)::value_type* get_##singular##_by_index(size_t index) { \ + decltype(registry)::value_type const_kw* get_##singular##_by_index(size_t index) const_kw { \ return index >= index_offset ? registry.get_item_by_index(index - index_offset) : nullptr; \ } \ - std::vector& get_##plural() { \ + std::vector const_kw& get_##plural() const_kw { \ return registry.get_items(); \ } \ NodeTools::callback_t expect_##singular##_str( \ - NodeTools::callback_t callback, bool warn = false \ - ) { \ + NodeTools::callback_t callback, bool warn = false \ + ) const_kw { \ return registry.expect_item_str(callback, warn); \ } \ NodeTools::node_callback_t expect_##singular##_identifier( \ - NodeTools::callback_t callback, bool warn = false \ - ) { \ + NodeTools::callback_t callback, bool warn = false \ + ) const_kw { \ return registry.expect_item_identifier(callback, warn); \ } \ NodeTools::node_callback_t expect_##singular##_dictionary( \ - NodeTools::callback_t callback \ - ) { \ + NodeTools::callback_t callback \ + ) const_kw { \ return registry.expect_item_dictionary(callback); \ } } -- cgit v1.2.3-56-ga3b1