diff options
author | wvpm <24685035+wvpm@users.noreply.github.com> | 2024-09-22 15:26:14 +0200 |
---|---|---|
committer | wvpm <24685035+wvpm@users.noreply.github.com> | 2024-09-22 15:26:14 +0200 |
commit | 26cbbc7612ce2f42cfd44f099aa72898656691a7 (patch) | |
tree | 3904d88c4775e53a5783440b2e34caf9e5b15137 /src/openvic-simulation/map | |
parent | bb11416cb9f1b1a626a84ec86cb64a466c99182a (diff) |
Clean up
Diffstat (limited to 'src/openvic-simulation/map')
-rw-r--r-- | src/openvic-simulation/map/MapInstance.cpp | 4 | ||||
-rw-r--r-- | src/openvic-simulation/map/MapInstance.hpp | 4 | ||||
-rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.cpp | 6 | ||||
-rw-r--r-- | src/openvic-simulation/map/ProvinceInstance.hpp | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/openvic-simulation/map/MapInstance.cpp b/src/openvic-simulation/map/MapInstance.cpp index 0b5286f..f428263 100644 --- a/src/openvic-simulation/map/MapInstance.cpp +++ b/src/openvic-simulation/map/MapInstance.cpp @@ -3,7 +3,7 @@ #include "openvic-simulation/history/ProvinceHistory.hpp" #include "openvic-simulation/map/MapDefinition.hpp" #include "openvic-simulation/utility/Logger.hpp" -#include "economy/production/ProductionType.hpp" +#include "openvic-simulation/economy/production/ProductionType.hpp" using namespace OpenVic; @@ -83,7 +83,7 @@ bool MapInstance::setup( bool MapInstance::apply_history_to_provinces( ProvinceHistoryManager const& history_manager, Date date, CountryInstanceManager& country_manager, - IssueManager const& issue_manager, ProductionTypeManager const& production_type_manager + IssueManager const& issue_manager ) { bool ret = true; diff --git a/src/openvic-simulation/map/MapInstance.hpp b/src/openvic-simulation/map/MapInstance.hpp index 22a564f..860bc64 100644 --- a/src/openvic-simulation/map/MapInstance.hpp +++ b/src/openvic-simulation/map/MapInstance.hpp @@ -5,7 +5,7 @@ #include "openvic-simulation/map/State.hpp" #include "openvic-simulation/types/Date.hpp" #include "openvic-simulation/types/IdentifierRegistry.hpp" -#include "economy/production/ProductionType.hpp" +#include "openvic-simulation/economy/production/ProductionType.hpp" namespace OpenVic { struct MapDefinition; @@ -50,7 +50,7 @@ namespace OpenVic { ); bool apply_history_to_provinces( ProvinceHistoryManager const& history_manager, Date date, CountryInstanceManager& country_manager, - IssueManager const& issue_manager, ProductionTypeManager const& production_type_manager + IssueManager const& issue_manager ); void update_gamestate(Date today, DefineManager const& define_manager); diff --git a/src/openvic-simulation/map/ProvinceInstance.cpp b/src/openvic-simulation/map/ProvinceInstance.cpp index ffcdfa1..98e8fcb 100644 --- a/src/openvic-simulation/map/ProvinceInstance.cpp +++ b/src/openvic-simulation/map/ProvinceInstance.cpp @@ -7,9 +7,9 @@ #include "openvic-simulation/military/UnitInstanceGroup.hpp" #include "openvic-simulation/misc/Define.hpp" #include "openvic-simulation/politics/Ideology.hpp" -#include "economy/production/ResourceGatheringOperation.hpp" -#include "pop/Pop.hpp" -#include "types/fixed_point/FixedPoint.hpp" +#include "openvic-simulation/economy/production/ResourceGatheringOperation.hpp" +#include "openvic-simulation/pop/Pop.hpp" +#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" using namespace OpenVic; diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp index f1d4b75..d551f37 100644 --- a/src/openvic-simulation/map/ProvinceInstance.hpp +++ b/src/openvic-simulation/map/ProvinceInstance.hpp @@ -12,8 +12,8 @@ #include "openvic-simulation/types/HasIdentifier.hpp" #include "openvic-simulation/types/OrderedContainers.hpp" #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp" -#include "economy/production/ResourceGatheringOperation.hpp" -#include "types/fixed_point/FixedPoint.hpp" +#include "openvic-simulation/economy/production/ResourceGatheringOperation.hpp" +#include "openvic-simulation/types/fixed_point/FixedPoint.hpp" namespace OpenVic { |