From 26cbbc7612ce2f42cfd44f099aa72898656691a7 Mon Sep 17 00:00:00 2001 From: wvpm <24685035+wvpm@users.noreply.github.com> Date: Sun, 22 Sep 2024 15:26:14 +0200 Subject: Clean up --- src/openvic-simulation/InstanceManager.cpp | 3 +-- src/openvic-simulation/economy/production/ProductionType.cpp | 1 - src/openvic-simulation/history/ProvinceHistory.cpp | 2 -- src/openvic-simulation/map/MapInstance.cpp | 4 ++-- src/openvic-simulation/map/MapInstance.hpp | 4 ++-- src/openvic-simulation/map/ProvinceInstance.cpp | 6 +++--- src/openvic-simulation/map/ProvinceInstance.hpp | 4 ++-- 7 files changed, 10 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/openvic-simulation/InstanceManager.cpp b/src/openvic-simulation/InstanceManager.cpp index d0a4a18..c9ce24a 100644 --- a/src/openvic-simulation/InstanceManager.cpp +++ b/src/openvic-simulation/InstanceManager.cpp @@ -126,8 +126,7 @@ bool InstanceManager::load_bookmark(Bookmark const* new_bookmark) { definition_manager.get_history_manager().get_province_manager(), today, country_instance_manager, // TODO - the following argument is for generating test pop attributes - definition_manager.get_politics_manager().get_issue_manager(), - definition_manager.get_economy_manager().get_production_type_manager() + definition_manager.get_politics_manager().get_issue_manager() ); ret &= country_instance_manager.apply_history_to_countries( diff --git a/src/openvic-simulation/economy/production/ProductionType.cpp b/src/openvic-simulation/economy/production/ProductionType.cpp index fd9bce7..5889986 100644 --- a/src/openvic-simulation/economy/production/ProductionType.cpp +++ b/src/openvic-simulation/economy/production/ProductionType.cpp @@ -1,7 +1,6 @@ #include "ProductionType.hpp" #include -#include "dataloader/NodeTools.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; diff --git a/src/openvic-simulation/history/ProvinceHistory.cpp b/src/openvic-simulation/history/ProvinceHistory.cpp index 7d3d6eb..b40b4a5 100644 --- a/src/openvic-simulation/history/ProvinceHistory.cpp +++ b/src/openvic-simulation/history/ProvinceHistory.cpp @@ -3,8 +3,6 @@ #include "openvic-simulation/DefinitionManager.hpp" #include "openvic-simulation/economy/GoodDefinition.hpp" #include "openvic-simulation/map/ProvinceDefinition.hpp" -#include "dataloader/NodeTools.hpp" -#include "types/IdentifierRegistry.hpp" using namespace OpenVic; using namespace OpenVic::NodeTools; 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 { -- cgit v1.2.3-56-ga3b1