Merge pull request #165 from OpenVicProject/instance-definition-managers

Separated GameManager into Definition and Instance Managers

1 files changed, 12 insertions, 6 deletions

diff --git a/src/openvic-simulation/history/ProvinceHistory.hpp b/src/openvic-simulation/history/ProvinceHistory.hpp
index 015b7be..7c283f4 100644
--- a/src/openvic-simulation/history/ProvinceHistory.hpp
+++ b/src/openvic-simulation/history/ProvinceHistory.hpp
@@ -19,7 +19,7 @@ namespace OpenVic {
 	struct GoodDefinition;
 	struct TerrainType;
 	struct Ideology;
-	struct GameManager;
+	struct DefinitionManager;
 
 	struct ProvinceHistoryEntry : HistoryEntry {
 		friend struct ProvinceHistoryMap;
@@ -45,7 +45,9 @@ namespace OpenVic {
 
 		ProvinceHistoryEntry(ProvinceDefinition const& new_province, Date new_date);
 
-		bool _load_province_pop_history(GameManager const& game_manager, ast::NodeCPtr root, bool *non_integer_size);
+		bool _load_province_pop_history(
+			DefinitionManager const& definition_manager, ast::NodeCPtr root, bool *non_integer_size
+		);
 	};
 
 	struct ProvinceHistoryManager;
@@ -60,11 +62,13 @@ namespace OpenVic {
 		ProvinceHistoryMap(ProvinceDefinition const& new_province);
 
 		std::unique_ptr<ProvinceHistoryEntry> _make_entry(Date date) const override;
-		bool _load_history_entry(GameManager const& game_manager, ProvinceHistoryEntry& entry, ast::NodeCPtr root) override;
+		bool _load_history_entry(
+			DefinitionManager const& definition_manager, ProvinceHistoryEntry& entry, ast::NodeCPtr root
+		) override;
 
 	private:
 		bool _load_province_pop_history(
-			GameManager const& game_manager, Date date, ast::NodeCPtr root, bool *non_integer_size
+			DefinitionManager const& definition_manager, Date date, ast::NodeCPtr root, bool *non_integer_size
 		);
 	};
 
@@ -87,8 +91,10 @@ namespace OpenVic {
 		ProvinceHistoryMap const* get_province_history(ProvinceDefinition const* province) const;
 
 		bool load_province_history_file(
-			GameManager const& game_manager, ProvinceDefinition const& province, ast::NodeCPtr root
+			DefinitionManager const& definition_manager, ProvinceDefinition const& province, ast::NodeCPtr root
+		);
+		bool load_pop_history_file(
+			DefinitionManager const& definition_manager, Date date, ast::NodeCPtr root, bool *non_integer_size
 		);
-		bool load_pop_history_file(GameManager const& game_manager, Date date, ast::NodeCPtr root, bool *non_integer_size);
 	};
 }