diff options
Diffstat (limited to 'extension/src/openvic-extension/singletons')
5 files changed, 14 insertions, 13 deletions
diff --git a/extension/src/openvic-extension/singletons/GameSingleton.cpp b/extension/src/openvic-extension/singletons/GameSingleton.cpp index 7114189..074c8b5 100644 --- a/extension/src/openvic-extension/singletons/GameSingleton.cpp +++ b/extension/src/openvic-extension/singletons/GameSingleton.cpp @@ -188,8 +188,9 @@ Ref<ImageTexture> GameSingleton::get_flag_sheet_texture() const { int32_t GameSingleton::get_flag_sheet_index(int32_t country_index, godot::StringName const& flag_type) const { ERR_FAIL_COND_V_MSG( - country_index < 0 || country_index >= get_definition_manager().get_country_manager().get_country_count(), -1, - vformat("Invalid country index: %d", country_index) + country_index < 0 || + country_index >= get_definition_manager().get_country_definition_manager().get_country_definition_count(), + -1, vformat("Invalid country index: %d", country_index) ); const typename decltype(flag_type_index_map)::const_iterator it = flag_type_index_map.find(flag_type); @@ -487,10 +488,10 @@ Error GameSingleton::_load_flag_sheet() { government_type_manager.get_flag_types().empty() || !government_type_manager.government_types_are_locked(), FAILED, "Cannot load flag images if flag types are empty or government types are not locked!" ); - CountryManager const& country_manager = get_definition_manager().get_country_manager(); + CountryDefinitionManager const& country_definition_manager = get_definition_manager().get_country_definition_manager(); ERR_FAIL_COND_V_MSG( - country_manager.countries_empty() || !country_manager.countries_are_locked(), FAILED, - "Cannot load flag images if countries are empty or not locked!" + country_definition_manager.country_definitions_empty() || !country_definition_manager.country_definitions_are_locked(), + FAILED, "Cannot load flag images if countries are empty or not locked!" ); AssetManager* asset_manager = AssetManager::get_singleton(); @@ -502,7 +503,7 @@ Error GameSingleton::_load_flag_sheet() { flag_type_index_map.emplace(std_to_godot_string_name(type), static_cast<int32_t>(flag_type_index_map.size())); } - flag_sheet_count = country_manager.get_countries().size() * flag_type_index_map.size(); + flag_sheet_count = country_definition_manager.get_country_definition_count() * flag_type_index_map.size(); std::vector<Ref<Image>> flag_images; flag_images.reserve(flag_sheet_count); @@ -510,7 +511,7 @@ Error GameSingleton::_load_flag_sheet() { static constexpr Image::Format flag_format = Image::FORMAT_RGB8; Error ret = OK; - for (Country const& country : country_manager.get_countries()) { + for (CountryDefinition const& country : country_definition_manager.get_country_definitions()) { const String country_name = std_view_to_godot_string(country.get_identifier()); for (auto const& [flag_type, flag_type_index] : flag_type_index_map) { diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.cpp b/extension/src/openvic-extension/singletons/MenuSingleton.cpp index 79998d7..b4baf40 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.cpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.cpp @@ -207,7 +207,7 @@ Dictionary MenuSingleton::get_province_info_from_index(int32_t index) const { ret[province_info_life_rating_key] = province->get_life_rating(); - Country const* controller = province->get_controller(); + CountryDefinition const* controller = province->get_controller(); if (controller != nullptr) { ret[province_info_controller_key] = std_view_to_godot_string(controller->get_identifier()); } @@ -241,7 +241,7 @@ Dictionary MenuSingleton::get_province_info_from_index(int32_t index) const { ret[province_info_pop_cultures_key] = GFXPieChartTexture::distribution_to_slices_array(cultures); } - std::vector<Country const*> const& cores = province->get_cores(); + std::vector<CountryDefinition const*> const& cores = province->get_cores(); if (!cores.empty()) { PackedStringArray cores_array; if (cores_array.resize(cores.size()) == OK) { diff --git a/extension/src/openvic-extension/singletons/MenuSingleton.hpp b/extension/src/openvic-extension/singletons/MenuSingleton.hpp index a3bcb67..b89f948 100644 --- a/extension/src/openvic-extension/singletons/MenuSingleton.hpp +++ b/extension/src/openvic-extension/singletons/MenuSingleton.hpp @@ -20,7 +20,7 @@ namespace OpenVic { }; struct country_entry_t { - Country const& country; + CountryDefinition const& country; bool selected = true; }; diff --git a/extension/src/openvic-extension/singletons/ModelSingleton.cpp b/extension/src/openvic-extension/singletons/ModelSingleton.cpp index 8735780..7dea1bd 100644 --- a/extension/src/openvic-extension/singletons/ModelSingleton.cpp +++ b/extension/src/openvic-extension/singletons/ModelSingleton.cpp @@ -207,7 +207,7 @@ bool ModelSingleton::add_unit_dict(ordered_set<T*> const& units, TypedArray<Dict T const& unit = *units.back(); ERR_FAIL_COND_V_MSG(unit.empty(), false, vformat("Empty unit \"%s\"", std_view_to_godot_string(unit.get_name()))); - Country const* country = unit.get_country()->get_base_country(); + CountryDefinition const* country = unit.get_country()->get_country_definition(); GraphicalCultureType const& graphical_culture_type = country->get_graphical_culture(); UnitType const* display_unit_type = unit.get_display_unit_type(); diff --git a/extension/src/openvic-extension/singletons/PopulationMenu.cpp b/extension/src/openvic-extension/singletons/PopulationMenu.cpp index 1804539..1237e86 100644 --- a/extension/src/openvic-extension/singletons/PopulationMenu.cpp +++ b/extension/src/openvic-extension/singletons/PopulationMenu.cpp @@ -29,9 +29,9 @@ bool MenuSingleton::_population_menu_update_provinces() { MapInstance const& map_instance = instance_manager->get_map_instance(); ERR_FAIL_COND_V(!map_instance.province_instances_are_locked(), false); - for (Country const* country : { + for (CountryDefinition const* country : { // Example country - game_singleton->get_definition_manager().get_country_manager().get_country_by_identifier("ENG") + game_singleton->get_definition_manager().get_country_definition_manager().get_country_definition_by_identifier("ENG") }) { ERR_CONTINUE(country == nullptr); |