From 3cd1d62ec00690a1b29070dd4903754e8f089a21 Mon Sep 17 00:00:00 2001
From: Hop311 <hop3114@gmail.com>
Date: Wed, 6 Sep 2023 23:54:09 +0100
Subject: NodeTools cleanup+province definition csv loading

---
 src/openvic/dataloader/Dataloader.hpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/openvic/dataloader/Dataloader.hpp')

diff --git a/src/openvic/dataloader/Dataloader.hpp b/src/openvic/dataloader/Dataloader.hpp
index 3c868a3..9e5c24b 100644
--- a/src/openvic/dataloader/Dataloader.hpp
+++ b/src/openvic/dataloader/Dataloader.hpp
@@ -1,22 +1,21 @@
 #pragma once
 
 #include <filesystem>
+#include <functional>
+#include <vector>
 
 #include "openvic/types/Return.hpp"
 
-#include "openvic-dataloader/v2script/Parser.hpp"
-
 namespace OpenVic {
 	struct GameManager;
 	struct PopManager;
+	struct Map;
 
 	class Dataloader {
 		std::vector<std::filesystem::path> roots;
 
-		static ovdl::v2script::Parser parse_defines(std::filesystem::path const& path);
-		ovdl::v2script::Parser parse_defines_lookup(std::filesystem::path const& path) const;
-
 		return_t _load_pop_types(PopManager& pop_manager, std::filesystem::path const& pop_type_directory) const;
+		return_t _load_map_dir(Map& map, std::filesystem::path const& map_directory) const;
 
 	public:
 		Dataloader() = default;
-- 
cgit v1.2.3-56-ga3b1