diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-12-02 01:41:15 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-02 01:41:15 +0100 |
| commit | cd6875d5e0ca5e2545fd0e1647678cd18a6c81c2 (patch) | |
| tree | 49016457c09ef3583b200a8bd016dc702b6e298e /src/openvic-simulation/dataloader/Dataloader.hpp | |
| parent | 0de3d5849cfb9faad0e3c8ce10a8152a916bba21 (diff) | |
| parent | c935e471782764dcc10a3175741a02ab3ffffa8e (diff) | |
Merge pull request #51 from OpenVicProject/dataloading-tech
Dataloading tech
Diffstat (limited to 'src/openvic-simulation/dataloader/Dataloader.hpp')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.hpp b/src/openvic-simulation/dataloader/Dataloader.hpp index 5039582..b5ec553 100644 --- a/src/openvic-simulation/dataloader/Dataloader.hpp +++ b/src/openvic-simulation/dataloader/Dataloader.hpp @@ -1,10 +1,8 @@ #pragma once -#include <filesystem> -#include <unordered_map> - #include <openvic-dataloader/csv/Parser.hpp> #include <openvic-dataloader/v2script/Parser.hpp> +#include <unordered_map> //keep this here or mac builds will fail #include "openvic-simulation/dataloader/NodeTools.hpp" @@ -15,6 +13,8 @@ namespace OpenVic { class UIManager; struct PopManager; struct UnitManager; + struct ModifierManager; + struct TechnologyManager; struct GoodManager; class Dataloader { @@ -26,7 +26,9 @@ namespace OpenVic { bool _load_interface_files(UIManager& ui_manager) const; bool _load_pop_types(PopManager& pop_manager, UnitManager const& unit_manager, GoodManager const& good_manager) const; - bool _load_units(UnitManager& unit_manager, GoodManager const& good_manager) const; + bool _load_units(GameManager& game_manager) const; + bool _load_goods(GameManager& game_manager, std::string_view goods_file) const; + bool _load_technologies(GameManager& game_manager, std::string_view technology_file) const; bool _load_map_dir(GameManager& game_manager) const; bool _load_history(GameManager& game_manager, bool unused_history_file_warnings) const; |