diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-10-13 10:16:44 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-10-13 10:16:44 +0200 |
| commit | 32fdf7c38b2e56339a2fffa71a7a61a854759e2c (patch) | |
| tree | 4ad745778dea488ad10509cf17d349c3ef0cc229 /src/openvic-simulation/dataloader/Dataloader.hpp | |
| parent | bb22324da1225a0ac458c1d69893bb3bd28bd6b7 (diff) | |
| parent | d95c3c9da75018e3e959e5493ebd9c520e00bf7a (diff) | |
Merge pull request #50 from OpenVicProject/changes
Lots of accumulated changes
Diffstat (limited to 'src/openvic-simulation/dataloader/Dataloader.hpp')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.hpp b/src/openvic-simulation/dataloader/Dataloader.hpp index 705da00..c4cd7c7 100644 --- a/src/openvic-simulation/dataloader/Dataloader.hpp +++ b/src/openvic-simulation/dataloader/Dataloader.hpp @@ -13,7 +13,8 @@ namespace OpenVic { struct GameManager; struct PopManager; - struct Map; + struct UnitManager; + struct GoodManager; class Dataloader { public: @@ -23,11 +24,12 @@ namespace OpenVic { path_vector_t roots; bool _load_pop_types(PopManager& pop_manager, fs::path const& pop_type_directory) const; - bool _load_units(GameManager& unit_manager, fs::path const& units_directory) const; + bool _load_units(UnitManager& unit_manager, GoodManager const& good_manager, fs::path const& units_directory) const; bool _load_map_dir(GameManager& game_manager, fs::path const& map_directory) const; public: static ovdl::v2script::Parser parse_defines(fs::path const& path); + static ovdl::v2script::Parser parse_lua_defines(fs::path const& path); static ovdl::csv::Windows1252Parser parse_csv(fs::path const& path); Dataloader() = default; @@ -89,5 +91,3 @@ namespace OpenVic { inline static std::unordered_map<hint_path_t, game_path_t, fshash> _cached_paths; }; } - - |