Merge pull request #174 from OpenVicProject/indexed-map

Add IndexedMap and use in low key count, high value density cases

1 files changed, 7 insertions, 5 deletions

diff --git a/src/openvic-simulation/politics/NationalFocus.hpp b/src/openvic-simulation/politics/NationalFocus.hpp
index f27af43..04a4100 100644
--- a/src/openvic-simulation/politics/NationalFocus.hpp
+++ b/src/openvic-simulation/politics/NationalFocus.hpp
@@ -1,9 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/misc/Modifier.hpp"
-#include "openvic-simulation/politics/Ideology.hpp"
-#include "openvic-simulation/pop/Pop.hpp"
 #include "openvic-simulation/scripts/ConditionScript.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
@@ -18,7 +15,9 @@ namespace OpenVic {
 		NationalFocusGroup(std::string_view new_identifier);
 	};
 
-	struct NationalFocus : HasIdentifier {
+	struct Ideology;
+
+	struct NationalFocus : Modifier {
 		friend struct NationalFocusManager;
 
 	private:
@@ -27,7 +26,6 @@ namespace OpenVic {
 		bool PROPERTY(has_flashpoint);
 		bool PROPERTY(own_provinces);
 		bool PROPERTY(outliner_show_as_percent);
-		ModifierValue PROPERTY(modifiers);
 		Ideology const* PROPERTY(loyalty_ideology);
 		fixed_point_t PROPERTY(loyalty_value);
 		ConditionScript PROPERTY(limit);
@@ -51,6 +49,10 @@ namespace OpenVic {
 		NationalFocus(NationalFocus&&) = default;
 	};
 
+	struct PopManager;
+	struct IdeologyManager;
+	struct GoodDefinitionManager;
+
 	struct NationalFocusManager {
 	private:
 		IdentifierRegistry<NationalFocusGroup> IDENTIFIER_REGISTRY(national_focus_group);