diff options
| author |   BrickPi <ajmach6@gmail.com> | 2024-08-06 23:39:24 +0200 |
|---|---|---|
| committer | BrickPi <ajmach6@gmail.com> | 2024-09-15 16:24:07 +0200 |
| commit | 8921ec4d9e79840264cd3540caa2d71fc7ab67a0 (patch) | |
| tree | 253699c699378e5035555feb1aa59591dda72c8d /src/openvic-simulation/dataloader/Dataloader.cpp | |
| parent | d8c04cbe53188d4717f8c49f918e01657dbf3440 (diff) | |
Simulation Side Rivers
Diffstat (limited to 'src/openvic-simulation/dataloader/Dataloader.cpp')
| -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; |