diff options
| author |   Hop311 <Hop3114@gmail.com> | 2024-01-24 01:47:16 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2024-01-24 01:47:16 +0100 |
| commit | 6bcb1e70a15755ceb0aaa13a080f85f8edb50911 (patch) | |
| tree | b30e9b5774130552fe97e27deaf0370d83920c43 /src/openvic-simulation/map/TerrainType.cpp | |
| parent | d4e597da089a81f719a9c33b46111d1c2c590124 (diff) | |
| parent | 268a6948c0400905dfc335427395519689f067f5 (diff) | |
Merge pull request #137 from OpenVicProject/reserve_more
Added reserve_more, expect_dictionary_key[s|_map]_reserve_length[_and_default]
Diffstat (limited to 'src/openvic-simulation/map/TerrainType.cpp')
| -rw-r--r-- | src/openvic-simulation/map/TerrainType.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/openvic-simulation/map/TerrainType.cpp b/src/openvic-simulation/map/TerrainType.cpp index a4529bf..e7dd068 100644 --- a/src/openvic-simulation/map/TerrainType.cpp +++ b/src/openvic-simulation/map/TerrainType.cpp @@ -130,11 +130,8 @@ TerrainTypeMapping::index_t TerrainTypeManager::get_terrain_texture_limit() cons } bool TerrainTypeManager::load_terrain_types(ModifierManager const& modifier_manager, ast::NodeCPtr root) { - const bool ret = expect_dictionary_keys_and_length_and_default( - [this](size_t size) -> size_t { - terrain_type_mappings.reserve(size - 2); - return size; - }, + const bool ret = expect_dictionary_keys_reserve_length_and_default( + terrain_type_mappings, std::bind_front(&TerrainTypeManager::_load_terrain_type_mapping, this), "terrain", ONE_EXACTLY, expect_uint(assign_variable_callback(terrain_texture_limit)), "categories", ONE_EXACTLY, _load_terrain_type_categories(modifier_manager) |