diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-07-04 10:38:54 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-07-04 10:38:54 +0200 |
| commit | 8c8b9349e26b4f606e18810a201ff378eaac19b2 (patch) | |
| tree | c8d10e8c2b38208401f30e9b3acf7fc4a071583f /src/openvic-simulation/diplomacy/CountryRelation.cpp | |
| parent | bfd539513af435564daf70f94f6cce146dd5c948 (diff) | |
| parent | 326db6b4779bf3662752243d929ff3d605870049 (diff) | |
Merge pull request #167 from OpenVicProject/country-definition
Renamed Country to CountryDefinition
Diffstat (limited to 'src/openvic-simulation/diplomacy/CountryRelation.cpp')
| -rw-r--r-- | src/openvic-simulation/diplomacy/CountryRelation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvic-simulation/diplomacy/CountryRelation.cpp b/src/openvic-simulation/diplomacy/CountryRelation.cpp index 2e058ab..0f97da1 100644 --- a/src/openvic-simulation/diplomacy/CountryRelation.cpp +++ b/src/openvic-simulation/diplomacy/CountryRelation.cpp @@ -2,7 +2,7 @@ #include <cassert> -#include "openvic-simulation/country/Country.hpp" +#include "openvic-simulation/country/CountryDefinition.hpp" #include "openvic-simulation/country/CountryInstance.hpp" #include "openvic-simulation/utility/ErrorMacros.hpp" @@ -11,7 +11,7 @@ using namespace OpenVic; CountryRelationInstanceProxy::CountryRelationInstanceProxy(std::string_view id) : country_id { id } {} CountryRelationInstanceProxy::CountryRelationInstanceProxy(CountryInstance const* country) - : country_id { country->get_base_country()->get_identifier() } {} + : country_id { country->get_country_definition()->get_identifier() } {} CountryRelationInstanceProxy::operator std::string_view() const { return country_id; |