Merge pull request #513 from OpenVicProject/construct_via_emplace

Construct via emplace

Author: wvpm

src/openvic-simulation/country/CountryDefinition.cpp

@@ -76,12 +76,13 @@ bool CountryDefinitionManager::add_country(
 
 	static constexpr colour_t default_colour = colour_t::fill_as(colour_t::max_value);
 
-	return country_definitions.add_item({
+	return country_definitions.emplace_item(
+		identifier,
 		identifier, colour, get_country_definition_count(), *graphical_culture, std::move(parties), std::move(unit_names),
 		dynamic_tag, std::move(alternative_colours),
 		/* Default to country colour for the chest and grey for the others. Update later if necessary. */
 		colour, default_colour, default_colour
-	});
+	);
 }
 
 bool CountryDefinitionManager::load_countries(
@@ -199,8 +200,10 @@ node_callback_t CountryDefinitionManager::load_country_party(
 			Logger::warning("Country party ", party_name, " has no ideology, defaulting to nullptr / no ideology");
 		}
 
-		ret &= country_parties.add_item(
-			{ party_name, start_date, end_date, ideology, std::move(policies) }, duplicate_warning_callback
+		ret &= country_parties.emplace_item(
+			party_name,
+			duplicate_warning_callback,
+			party_name, start_date, end_date, ideology, std::move(policies)
 		);
 
 		return ret;

src/openvic-simulation/country/CountryDefinition.hpp

@@ -22,8 +22,6 @@ namespace OpenVic {
 	struct CountryDefinitionManager;
 
 	struct CountryParty : HasIdentifierAndColour {
-		friend struct CountryDefinitionManager;
-
 		using policy_map_t = IndexedMap<IssueGroup, Issue const*>;
 
 	private:
@@ -32,19 +30,18 @@ namespace OpenVic {
 		Ideology const* PROPERTY(ideology); // Can be nullptr, shows up as "No Ideology" in game
 		policy_map_t PROPERTY(policies);
 
+	public:
 		CountryParty(
 			std::string_view new_identifier, Date new_start_date, Date new_end_date, Ideology const* new_ideology,
 			policy_map_t&& new_policies
 		);
-
-	public:
 		CountryParty(CountryParty&&) = default;
 	};
 
 	/* Generic information about a TAG */
 	struct CountryDefinition : HasIdentifierAndColour, HasIndex<CountryDefinition> {
 		friend struct CountryDefinitionManager;
-
+		
 		using unit_names_map_t = ordered_map<UnitType const*, name_list_t>;
 		using government_colour_map_t = ordered_map<GovernmentType const*, colour_t>;
 
@@ -61,14 +58,14 @@ namespace OpenVic {
 		colour_t PROPERTY(tertiary_unit_colour);
 		// Unit colours not const due to being added after construction
 
+
+	public:
 		CountryDefinition(
 			std::string_view new_identifier, colour_t new_colour, index_t new_index,
 			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,
 			colour_t new_primary_unit_colour, colour_t new_secondary_unit_colour, colour_t new_tertiary_unit_colour
 		);
-
-	public:
 		CountryDefinition(CountryDefinition&&) = default;
 
 		// TODO - get_colour including alternative colours

src/openvic-simulation/country/CountryInstance.cpp

@@ -2323,7 +2323,8 @@ bool CountryInstanceManager::generate_country_instances(
 	bool ret = true;
 
 	for (CountryDefinition const& country_definition : country_definition_manager.get_country_definitions()) {
-		if (country_instances.add_item({
+		if (country_instances.emplace_item(
+			country_definition.get_identifier(),
 			&country_definition,
 			get_country_instance_count(),
 			building_type_keys,
@@ -2344,7 +2345,7 @@ bool CountryInstanceManager::generate_country_instances(
 			good_instance_manager,
 			country_defines,
 			economy_defines
-		})) {
+		)) {
 			// We need to update the country's ModifierSum's source here as the country's address is finally stable
 			// after changing between its constructor call and now due to being std::move'd into the registry.
 			CountryInstance& country_instance = get_back_country_instance();

src/openvic-simulation/country/CountryInstance.hpp

@@ -345,6 +345,7 @@ namespace OpenVic {
 		unlock_level_t PROPERTY(gas_defence_unlock_level, 0);
 		memory::vector<unlock_level_t> PROPERTY(unit_variant_unlock_levels);
 
+	public:
 		CountryInstance(
 			CountryDefinition const* new_country_definition,
 			index_t new_index,
@@ -368,7 +369,6 @@ namespace OpenVic {
 			EconomyDefines const& new_economy_defines
 		);
 
-	public:
 		UNIT_BRANCHED_GETTER(get_unit_instance_groups, armies, navies);
 		UNIT_BRANCHED_GETTER(get_unit_type_unlock_levels, regiment_type_unlock_levels, ship_type_unlock_levels);
 		UNIT_BRANCHED_GETTER(get_leaders, generals, admirals);

src/openvic-simulation/dataloader/ModManager.cpp

@@ -38,8 +38,8 @@ bool ModManager::load_mod_file(ast::NodeCPtr root) {
 	}
 
 	if (ret) {
-		ret &= mods.add_item(
-			{ identifier, path, user_dir, std::move(replace_paths), std::move(dependencies) }
+		ret &= mods.emplace_item(
+			identifier, identifier, path, user_dir, std::move(replace_paths), std::move(dependencies)
 		);
 	}
 

src/openvic-simulation/dataloader/ModManager.hpp

@@ -1,26 +1,21 @@
 #pragma once
 
 #include <string_view>
-#include <vector>
 
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 
 namespace OpenVic {
-
 	struct Mod : HasIdentifier {
-		friend struct ModManager;
-
 	private:
 		const memory::string PROPERTY(dataloader_root_path);
 		const std::optional<memory::string> PROPERTY(user_dir);
 		const memory::vector<memory::string> PROPERTY(replace_paths);
 		const memory::vector<memory::string> PROPERTY(dependencies);
 
-		Mod(std::string_view new_identifier, std::string_view new_path, std::optional<std::string_view> new_user_dir, memory::vector<memory::string> new_replace_paths, memory::vector<memory::string> new_dependencies);
-
 	public:
+		Mod(std::string_view new_identifier, std::string_view new_path, std::optional<std::string_view> new_user_dir, memory::vector<memory::string> new_replace_paths, memory::vector<memory::string> new_dependencies);
 		Mod(Mod&&) = default;
 	};
 
@@ -34,4 +29,4 @@ namespace OpenVic {
 
 		bool load_mod_file(ast::NodeCPtr root);
 	};
-} // namespace OpenVic
+}

src/openvic-simulation/diplomacy/DiplomaticAction.cpp

@@ -26,7 +26,7 @@ bool DiplomaticActionManager::add_diplomatic_action(
 		Logger::error("Invalid diplomatic action identifier - empty!");
 		return false;
 	}
-	return diplomatic_action_types.add_item({ identifier, DiplomaticActionType { std::move(initializer) } });
+	return diplomatic_action_types.emplace_item( identifier, identifier, DiplomaticActionType { std::move(initializer) } );
 }
 
 bool DiplomaticActionManager::add_cancelable_diplomatic_action(
@@ -36,7 +36,7 @@ bool DiplomaticActionManager::add_cancelable_diplomatic_action(
 		Logger::error("Invalid cancelable diplomatic action identifier - empty!");
 		return false;
 	}
-	return diplomatic_action_types.add_item({ identifier, CancelableDiplomaticActionType { std::move(initializer) } });
+	return diplomatic_action_types.emplace_item( identifier, identifier, CancelableDiplomaticActionType { std::move(initializer) } );
 }
 
 DiplomaticActionTickCache DiplomaticActionManager::create_diplomatic_action_tick(

src/openvic-simulation/economy/BuildingInstance.hpp

@@ -4,7 +4,6 @@
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
-
 	struct BuildingInstance : HasIdentifier { // used in the actual game
 		using level_t = BuildingType::level_t;
 

src/openvic-simulation/economy/BuildingType.cpp

@@ -44,7 +44,7 @@ bool BuildingTypeManager::add_building_type(
 		return false;
 	}
 
-	const bool ret = building_types.add_item({ identifier, building_type_args });
+	const bool ret = building_types.emplace_item( identifier, identifier, building_type_args );
 
 	if (ret) {
 		building_type_types.emplace(building_type_args.type);

src/openvic-simulation/economy/BuildingType.hpp

@@ -9,17 +9,12 @@
 #include "openvic-simulation/utility/Containers.hpp"
 
 namespace OpenVic {
-
-	struct BuildingTypeManager;
-
 	/* REQUIREMENTS:
 	 * MAP-11, MAP-72, MAP-73
 	 * MAP-12, MAP-75, MAP-76
 	 * MAP-13, MAP-78, MAP-79
 	 */
 	struct BuildingType : Modifier {
-		friend struct BuildingTypeManager;
-
 		using level_t = int16_t;
 		using naval_capacity_t = uint64_t;
 
@@ -73,9 +68,8 @@ namespace OpenVic {
 		bool PROPERTY(capital); // only in naval base
 		bool PROPERTY_CUSTOM_PREFIX(port, is); // only in naval base
 
-		BuildingType(std::string_view identifier, building_type_args_t& building_type_args);
-
 	public:
+		BuildingType(std::string_view identifier, building_type_args_t& building_type_args);
 		BuildingType(BuildingType&&) = default;
 	};