From f95902fdd85f86c10b9c300099c67312fc81f11b Mon Sep 17 00:00:00 2001
From: Hop311 <hop3114@gmail.com>
Date: Sat, 16 Sep 2023 16:27:41 +0100
Subject: Scaffolding for `positions.txt` + modifier loading

---
 src/openvic-simulation/dataloader/Dataloader.hpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/src/openvic-simulation/dataloader/Dataloader.hpp b/src/openvic-simulation/dataloader/Dataloader.hpp
index 2b358b6..b07248e 100644
--- a/src/openvic-simulation/dataloader/Dataloader.hpp
+++ b/src/openvic-simulation/dataloader/Dataloader.hpp
@@ -4,6 +4,8 @@
 #include <functional>
 #include <vector>
 
+#include "openvic-simulation/dataloader/NodeTools.hpp"
+
 namespace OpenVic {
 	namespace fs = std::filesystem;
 
@@ -33,7 +35,7 @@ namespace OpenVic {
 		fs::path lookup_file(fs::path const& path) const;
 		path_vector_t lookup_files_in_dir(fs::path const& path, fs::path const& extension) const;
 		bool apply_to_files_in_dir(fs::path const& path, fs::path const& extension,
-			std::function<bool(fs::path const&)> callback) const;
+			NodeTools::callback_t<fs::path const&> callback) const;
 
 		bool load_defines(GameManager& game_manager) const;
 		bool load_pop_history(GameManager& game_manager, fs::path const& path) const;
@@ -46,7 +48,7 @@ namespace OpenVic {
 		};
 
 		/* Args: key, locale, localisation */
-		using localisation_callback_t = std::function<bool(std::string_view, locale_t, std::string_view)>;
+		using localisation_callback_t = NodeTools::callback_t<std::string_view, locale_t, std::string_view>;
 		bool load_localisation_files(localisation_callback_t callback, fs::path const& localisation_dir = "localisation");
 	};
 }
-- 
cgit v1.2.3-56-ga3b1