From 7b544078eb0e7cad58bd6fc5251a3c185c9bb082 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 9 Feb 2024 23:50:14 +0100 Subject: loader: add invalid wall atlas to the list --- loader/wall-traits.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'loader') diff --git a/loader/wall-traits.cpp b/loader/wall-traits.cpp index 8f1c2e23..f51974bc 100644 --- a/loader/wall-traits.cpp +++ b/loader/wall-traits.cpp @@ -27,12 +27,24 @@ void wall_traits::ensure_atlases_loaded(Storage& st) return; fm_assert(st.name_map.empty()); + constexpr bool add_invalid = true; + st.cell_array = wall_cell::load_atlases_from_json().vec; st.name_map.reserve(st.cell_array.size()); + fm_assert(!st.cell_array.empty()); + fm_assert(st.name_map.empty()); + + if constexpr(add_invalid) + { + for (auto& x : st.cell_array) + fm_soft_assert(x.name != loader.INVALID); + st.cell_array.push_back(make_invalid_atlas(st)); + } for (auto& c : st.cell_array) { - fm_soft_assert(c.name != ""_s); + if constexpr(!add_invalid) + fm_soft_assert(c.name != ""_s); fm_soft_assert(loader.check_atlas_name(c.name)); StringView name = c.name; st.name_map[name] = &c; -- cgit v1.2.3