diff options
| author |   CptAlanSmith <123112708+CptAlanSmith@users.noreply.github.com> | 2023-09-23 20:25:15 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-09-23 20:25:15 +0200 |
| commit | 005a8026bb424779a146e00cc48621ff1d72b807 (patch) | |
| tree | dde15211e31d861b61711bf6aebdeb8713393d53 /src/openvic-simulation/dataloader/Dataloader.hpp | |
| parent | ebea2e473eefa3945508b0bf622a472b62d70d3b (diff) | |
Testing (#23)
* Fixes for building scons
* Initial proof of concept auto-testing
Shows how we can pull loaded data and display it back
* Re-did headless
Because hubert insisted it be done like this ;)
* Auto-Testing Framework Basics
* Requirements Calculations
* Fix for messy merge (teach me to use merge tools)
* Fixing up misc merge issues to fully reconcile with master changes
* Re-added missing getters
* Move of testing files due to folder reorgs
* Use new accessors + int reading fix
---------
Co-authored-by: Hop311 <hop3114@gmail.com>
Diffstat (limited to 'src/openvic-simulation/dataloader/Dataloader.hpp')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.hpp b/src/openvic-simulation/dataloader/Dataloader.hpp index 9e15102..e935091 100644 --- a/src/openvic-simulation/dataloader/Dataloader.hpp +++ b/src/openvic-simulation/dataloader/Dataloader.hpp @@ -5,7 +5,6 @@ #include <vector> #include "openvic-simulation/dataloader/NodeTools.hpp" -#include "units/Unit.hpp" namespace OpenVic { namespace fs = std::filesystem; @@ -22,7 +21,7 @@ namespace OpenVic { path_vector_t roots; bool _load_pop_types(PopManager& pop_manager, fs::path const& pop_type_directory) const; - bool _load_units(UnitManager& unit_manager, fs::path const& units_directory) const; + bool _load_units(GameManager& unit_manager, fs::path const& units_directory) const; bool _load_map_dir(GameManager& game_manager, fs::path const& map_directory) const; public: |