Merge pull request #75 from OpenVicProject/accumulated-changes

Accumulated changes

1 files changed, 9 insertions, 9 deletions

diff --git a/src/openvic-simulation/politics/NationalFocus.hpp b/src/openvic-simulation/politics/NationalFocus.hpp
index 7c5e40a..396f8ec 100644
--- a/src/openvic-simulation/politics/NationalFocus.hpp
+++ b/src/openvic-simulation/politics/NationalFocus.hpp
@@ -2,7 +2,7 @@
 
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
-#include "openvic-simulation/Modifier.hpp"
+#include "openvic-simulation/misc/Modifier.hpp"
 #include "openvic-simulation/pop/Pop.hpp"
 #include "openvic-simulation/politics/Ideology.hpp"
 #include "openvic-simulation/economy/Good.hpp"
@@ -14,7 +14,7 @@ namespace OpenVic {
 
 	struct NationalFocusGroup : HasIdentifier {
 		friend struct NationalFocusManager;
-	
+
 	private:
 		NationalFocusGroup(std::string_view new_identifier);
 	};
@@ -23,9 +23,9 @@ namespace OpenVic {
 		friend struct NationalFocusManager;
 
 	public:
-		using pop_promotion_map_t = std::map<PopType const*, fixed_point_t>;
-		using party_loyalty_map_t = std::map<Ideology const*, fixed_point_t>;
-		using production_map_t = std::map<Good const*, fixed_point_t>;
+		using pop_promotion_map_t = fixed_point_map_t<PopType const*>;
+		using party_loyalty_map_t = fixed_point_map_t<Ideology const*>;
+		using production_map_t = fixed_point_map_t<Good const*>;
 
 	private:
 		uint8_t PROPERTY(icon);
@@ -39,8 +39,8 @@ namespace OpenVic {
 			std::string_view new_identifier,
 			uint8_t new_icon,
 			NationalFocusGroup const& new_group,
-			ModifierValue&& new_modifiers, 
-			pop_promotion_map_t&& new_encouraged_promotion, 
+			ModifierValue&& new_modifiers,
+			pop_promotion_map_t&& new_encouraged_promotion,
 			party_loyalty_map_t&& new_encouraged_loyalty,
 			production_map_t&& new_encouraged_production
 		);
@@ -64,8 +64,8 @@ namespace OpenVic {
 			std::string_view identifier,
 			uint8_t icon,
 			NationalFocusGroup const& group,
-			ModifierValue&& modifiers, 
-			NationalFocus::pop_promotion_map_t&& encouraged_promotion, 
+			ModifierValue&& modifiers,
+			NationalFocus::pop_promotion_map_t&& encouraged_promotion,
 			NationalFocus::party_loyalty_map_t&& encouraged_loyalty,
 			NationalFocus::production_map_t&& encouraged_production
 		);