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.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/map/State.cpp')
| -rw-r--r-- | src/openvic-simulation/map/State.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/openvic-simulation/map/State.cpp b/src/openvic-simulation/map/State.cpp index 46ff11d..42d84cc 100644 --- a/src/openvic-simulation/map/State.cpp +++ b/src/openvic-simulation/map/State.cpp @@ -1,6 +1,5 @@ #include "State.hpp" -#include "openvic-simulation/country/Country.hpp" #include "openvic-simulation/map/MapDefinition.hpp" #include "openvic-simulation/map/MapInstance.hpp" #include "openvic-simulation/map/ProvinceInstance.hpp" @@ -9,8 +8,8 @@ using namespace OpenVic; State::State( - StateSet const& new_state_set, Country const* owner, ProvinceInstance* capital, std::vector<ProvinceInstance*>&& provinces, - ProvinceInstance::colony_status_t colony_status + StateSet const& new_state_set, CountryDefinition const* owner, ProvinceInstance* capital, + std::vector<ProvinceInstance*>&& provinces, ProvinceInstance::colony_status_t colony_status ) : state_set { new_state_set }, owner { owner }, capital { capital }, provinces { std::move(provinces) }, colony_status { colony_status } {} |