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/map | |
| 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/map')
| -rw-r--r-- | src/openvic-simulation/map/Building.hpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/map/Map.cpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/map/Province.cpp | 2 | ||||
| -rw-r--r-- | src/openvic-simulation/map/Province.hpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/openvic-simulation/map/Building.hpp b/src/openvic-simulation/map/Building.hpp index d36dfd4..d9b9e5e 100644 --- a/src/openvic-simulation/map/Building.hpp +++ b/src/openvic-simulation/map/Building.hpp @@ -73,7 +73,7 @@ namespace OpenVic { struct BuildingManager { private: - IdentifierRegistry<BuildingType> building_types; + IdentifierRegistry<BuildingType> building_types; // TODO: This needs a getter public: BuildingManager(); diff --git a/src/openvic-simulation/map/Map.cpp b/src/openvic-simulation/map/Map.cpp index 5082906..6cafb57 100644 --- a/src/openvic-simulation/map/Map.cpp +++ b/src/openvic-simulation/map/Map.cpp @@ -517,7 +517,7 @@ bool Map::_generate_province_adjacencies() { } return false; }; - + for (size_t y = 0; y < height; ++y) { for (size_t x = 0; x < width; ++x) { Province* cur = get_province_by_index(province_shape_image[x + y * width].index); diff --git a/src/openvic-simulation/map/Province.cpp b/src/openvic-simulation/map/Province.cpp index 6ec17b1..c1e96e9 100644 --- a/src/openvic-simulation/map/Province.cpp +++ b/src/openvic-simulation/map/Province.cpp @@ -140,7 +140,7 @@ void Province::tick(Date const& today) { building.tick(today); } -Province::adjacency_t::adjacency_t(Province const* province, distance_t distance, flags_t flags) +Province::adjacency_t::adjacency_t(Province const* province, distance_t distance, flags_t flags) : province { province }, distance { distance }, flags { flags } { assert(province != nullptr); } diff --git a/src/openvic-simulation/map/Province.hpp b/src/openvic-simulation/map/Province.hpp index 370d05c..0a4aa46 100644 --- a/src/openvic-simulation/map/Province.hpp +++ b/src/openvic-simulation/map/Province.hpp @@ -18,7 +18,7 @@ namespace OpenVic { using index_t = uint16_t; using life_rating_t = int8_t; using distance_t = uint16_t; - using flags_t = uint16_t; + using flags_t = uint16_t; struct adjacency_t { friend struct Province; |