diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-09-21 18:47:22 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-09-21 18:47:22 +0200 |
| commit | 7e895eaea194e266b112cb507b0d643083f2ad4b (patch) | |
| tree | 0b63109a3b044363cd92e0388994604b013b49f2 /src/openvic-simulation/dataloader | |
| parent | 4b69a91a6db50f86efec503b56b07573c692df9f (diff) | |
| parent | be284699453b2ee629725fa5cc2f84a2ca7684a2 (diff) | |
Merge pull request #196 from OpenVicProject/riversHEADtopbar-techmaster
Simulation Side Rivers
Diffstat (limited to 'src/openvic-simulation/dataloader')
| -rw-r--r-- | src/openvic-simulation/dataloader/Dataloader.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/openvic-simulation/dataloader/Dataloader.cpp b/src/openvic-simulation/dataloader/Dataloader.cpp index 1be040f..99a8d68 100644 --- a/src/openvic-simulation/dataloader/Dataloader.cpp +++ b/src/openvic-simulation/dataloader/Dataloader.cpp @@ -683,7 +683,7 @@ bool Dataloader::_load_map_dir(DefinitionManager& definition_manager) const { static constexpr std::string_view default_provinces = "provinces.bmp"; static constexpr std::string_view default_positions = "positions.txt"; static constexpr std::string_view default_terrain = "terrain.bmp"; - static constexpr std::string_view default_rivers = "rivers.bmp"; // TODO - load rivers into map pixel data + static constexpr std::string_view default_rivers = "rivers.bmp"; static constexpr std::string_view default_terrain_definition = "terrain.txt"; static constexpr std::string_view default_tree_definition = "trees.txt"; /* Tree textures and density values (unused). */ static constexpr std::string_view default_continent = "continent.txt"; @@ -781,7 +781,8 @@ bool Dataloader::_load_map_dir(DefinitionManager& definition_manager) const { if (!map_definition.load_map_images( lookup_file(append_string_views(map_directory, provinces)), - lookup_file(append_string_views(map_directory, terrain)), false + lookup_file(append_string_views(map_directory, terrain)), + lookup_file(append_string_views(map_directory, rivers)), false )) { Logger::error("Failed to load map images!"); ret = false; |