Big Dataloader Commit (openvic-simulation)

1 files changed, 18 insertions, 10 deletions

diff --git a/src/openvic/dataloader/Dataloader.hpp b/src/openvic/dataloader/Dataloader.hpp
index 062f3d5..b080300 100644
--- a/src/openvic/dataloader/Dataloader.hpp
+++ b/src/openvic/dataloader/Dataloader.hpp
@@ -1,16 +1,24 @@
 #pragma once
-#include <filesystem>
-#include "../Simulation.hpp"
+
+#include "openvic/types/Return.hpp"
+#include "openvic-dataloader/v2script/Parser.hpp"
 
 namespace OpenVic {
+	struct GameManager;
+
 	class Dataloader {
-		public:
-		enum class LoadingMode {
-			DL_COMPATIBILITY
-		};
+		std::vector<std::filesystem::path> roots;
+
+	public:
+		Dataloader() = default;
+
+		/* In reverse-load order, so base defines first and final loaded mod last */
+		return_t set_roots(std::vector<std::filesystem::path> new_roots);
+
+		std::filesystem::path lookup_file(std::filesystem::path const& path) const;
+		std::vector<std::filesystem::path> lookup_files_in_dir(std::filesystem::path const& path) const;
 
-		static bool loadDir(std::filesystem::path p, Simulation& sim, LoadingMode loadMode = LoadingMode::DL_COMPATIBILITY) {
-			return true;
-		}
+		return_t load_defines(GameManager& game_manager) const;
+		return_t load_pop_history(GameManager& game_manager, std::filesystem::path const& path) const;
 	};
-}
\ No newline at end of file
+}