aboutsummaryrefslogtreecommitdiff
path: root/src/openvic-simulation/pop
diff options
context:
space:
mode:
author hop311 <hop3114@gmail.com>2024-04-15 01:24:29 +0200
committer hop311 <hop3114@gmail.com>2024-04-15 01:24:29 +0200
commit8708e62d96fe298e1135538298172b6283bc56fb (patch)
treea469bafcaa47d25d5c62078c69c1721343e4dfcd /src/openvic-simulation/pop
parent083365191bd5f586edd850e0bd6a0190de782ab1 (diff)
Dynamically load default GraphicalCultureType
Diffstat (limited to 'src/openvic-simulation/pop')
-rw-r--r--src/openvic-simulation/pop/Culture.cpp30
-rw-r--r--src/openvic-simulation/pop/Culture.hpp7
2 files changed, 21 insertions, 16 deletions
diff --git a/src/openvic-simulation/pop/Culture.cpp b/src/openvic-simulation/pop/Culture.cpp
index 9466e9f..18ed3d8 100644
--- a/src/openvic-simulation/pop/Culture.cpp
+++ b/src/openvic-simulation/pop/Culture.cpp
@@ -22,6 +22,8 @@ Culture::Culture(
first_names { std::move(new_first_names) }, last_names { std::move(new_last_names) }, radicalism { new_radicalism },
primary_country { new_primary_country } {}
+CultureManager::CultureManager() : default_graphical_culture_type { nullptr } {}
+
bool CultureManager::add_graphical_culture_type(std::string_view identifier) {
if (identifier.empty()) {
Logger::error("Invalid culture group identifier - empty!");
@@ -78,17 +80,26 @@ bool CultureManager::load_graphical_culture_type_file(ast::NodeCPtr root) {
graphical_culture_types,
expect_identifier(std::bind_front(&CultureManager::add_graphical_culture_type, this))
)(root);
+
lock_graphical_culture_types();
+
+ if (graphical_culture_types_empty()) {
+ Logger::error("Cannot set default graphical culture type - none loaded!");
+ return false;
+ }
+
+ /* Last defined graphical culture type is used as default. */
+ default_graphical_culture_type = &get_graphical_culture_types().back();
+
return ret;
}
bool CultureManager::_load_culture_group(
- CountryManager const& country_manager, size_t& total_expected_cultures,
- GraphicalCultureType const* default_unit_graphical_culture_type, std::string_view culture_group_key,
+ CountryManager const& country_manager, size_t& total_expected_cultures, std::string_view culture_group_key,
ast::NodeCPtr culture_group_node
) {
std::string_view leader {};
- GraphicalCultureType const* unit_graphical_culture_type = default_unit_graphical_culture_type;
+ GraphicalCultureType const* unit_graphical_culture_type = default_graphical_culture_type;
bool is_overseas = true;
Country const* union_country = nullptr;
@@ -152,21 +163,12 @@ bool CultureManager::load_culture_file(CountryManager const& country_manager, as
return false;
}
- static constexpr std::string_view default_unit_graphical_culture_type_identifier = "Generic";
- GraphicalCultureType const* const default_unit_graphical_culture_type =
- get_graphical_culture_type_by_identifier(default_unit_graphical_culture_type_identifier);
- if (default_unit_graphical_culture_type == nullptr) {
- Logger::error("Failed to find default unit graphical culture type: ", default_unit_graphical_culture_type_identifier);
- }
-
size_t total_expected_cultures = 0;
bool ret = expect_dictionary_reserve_length(culture_groups,
- [this, &country_manager, default_unit_graphical_culture_type, &total_expected_cultures](
+ [this, &country_manager, &total_expected_cultures](
std::string_view key, ast::NodeCPtr value
) -> bool {
- return _load_culture_group(
- country_manager, total_expected_cultures, default_unit_graphical_culture_type, key, value
- );
+ return _load_culture_group(country_manager, total_expected_cultures, key, value);
}
)(root);
lock_culture_groups();
diff --git a/src/openvic-simulation/pop/Culture.hpp b/src/openvic-simulation/pop/Culture.hpp
index 8807123..72ea3ee 100644
--- a/src/openvic-simulation/pop/Culture.hpp
+++ b/src/openvic-simulation/pop/Culture.hpp
@@ -61,10 +61,11 @@ namespace OpenVic {
IdentifierRegistry<CultureGroup> IDENTIFIER_REGISTRY(culture_group);
IdentifierRegistry<Culture> IDENTIFIER_REGISTRY(culture);
+ GraphicalCultureType const* PROPERTY(default_graphical_culture_type);
+
bool _load_culture_group(
CountryManager const& country_manager, size_t& total_expected_cultures,
- GraphicalCultureType const* default_unit_graphical_culture_type, std::string_view culture_group_key,
- ast::NodeCPtr culture_group_node
+ std::string_view culture_group_key, ast::NodeCPtr culture_group_node
);
bool _load_culture(
CountryManager const& country_manager, CultureGroup const& culture_group, std::string_view culture_key,
@@ -72,6 +73,8 @@ namespace OpenVic {
);
public:
+ CultureManager();
+
bool add_graphical_culture_type(std::string_view identifier);
bool add_culture_group(