summaryrefslogtreecommitdiffhomepage
path: root/loader/wall-atlas.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-12-11 02:19:12 +0100
committerStanislaw Halik <sthalik@misaki.pl>2023-12-11 02:19:12 +0100
commiteaa6c76bd92e292ac59dcfa0a7aa70cd1e2f50fb (patch)
tree5110a6fe2fb70e7fbd66db70a37287c00ccf4fda /loader/wall-atlas.cpp
parent067a3f3ae0c1ab94ace005897673a484e165b31b (diff)
w
Diffstat (limited to 'loader/wall-atlas.cpp')
-rw-r--r--loader/wall-atlas.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/loader/wall-atlas.cpp b/loader/wall-atlas.cpp
index 745c5eb8..9d5c8c2b 100644
--- a/loader/wall-atlas.cpp
+++ b/loader/wall-atlas.cpp
@@ -25,15 +25,15 @@ using nlohmann::json;
val = {};
val.name = j["name"];
fm_soft_assert(loader.check_atlas_name(val.name));
- if (j.contains("description"))
- val.descr = j["description"];
+ if (j.contains("descr"))
+ val.descr = j["descr"];
}
[[maybe_unused]] static void to_json(json& j, const wall_info& val)
{
j["name"] = val.name;
if (val.descr)
- j["description"] = val.descr;
+ j["descr"] = val.descr;
}
} // namespace floormat
@@ -112,6 +112,7 @@ ArrayView<const wall_info> loader_impl::wall_atlas_list()
{
if (wall_atlas_map.empty())
get_wall_atlas_list();
+ fm_assert(!wall_atlas_map.empty());
return wall_atlas_array;
}