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/map/State.hpp | |
| parent | bfd539513af435564daf70f94f6cce146dd5c948 (diff) | |
| parent | 326db6b4779bf3662752243d929ff3d605870049 (diff) | |
Merge pull request #167 from OpenVicProject/country-definition
Renamed Country to CountryDefinition
Diffstat (limited to 'src/openvic-simulation/map/State.hpp')
| -rw-r--r-- | src/openvic-simulation/map/State.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/openvic-simulation/map/State.hpp b/src/openvic-simulation/map/State.hpp index ff8acfa..6111668 100644 --- a/src/openvic-simulation/map/State.hpp +++ b/src/openvic-simulation/map/State.hpp @@ -9,7 +9,7 @@ namespace OpenVic { struct StateManager; struct StateSet; - struct Country; + struct CountryDefinition; struct ProvinceInstance; struct State { @@ -17,7 +17,7 @@ namespace OpenVic { private: StateSet const& PROPERTY(state_set); - Country const* PROPERTY(owner); + CountryDefinition const* PROPERTY(owner); ProvinceInstance* PROPERTY(capital); std::vector<ProvinceInstance*> PROPERTY(provinces); ProvinceInstance::colony_status_t PROPERTY(colony_status); @@ -25,7 +25,7 @@ namespace OpenVic { Pop::pop_size_t PROPERTY(total_population); State( - StateSet const& new_state_set, Country const* owner, ProvinceInstance* capital, + StateSet const& new_state_set, CountryDefinition const* owner, ProvinceInstance* capital, std::vector<ProvinceInstance*>&& provinces, ProvinceInstance::colony_status_t colony_status ); |