summaryrefslogtreecommitdiffhomepage
path: root/editor
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-01-11 22:01:38 +0100
committerStanislaw Halik <sthalik@misaki.pl>2024-01-11 22:01:38 +0100
commit1a84f009b39c070a8d4f4931e2376936190a161e (patch)
tree7ad71362644592e95f8eeb5f331b1f7cdd3b841e /editor
parent96e3bb9c8a368f649bfb1c60a3fe92b9d415c288 (diff)
a
Diffstat (limited to 'editor')
-rw-r--r--editor/imgui-editors.cpp2
-rw-r--r--editor/scenery-editor.hpp2
-rw-r--r--editor/scenery-json.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/editor/imgui-editors.cpp b/editor/imgui-editors.cpp
index 595d6c77..e2f4b5c1 100644
--- a/editor/imgui-editors.cpp
+++ b/editor/imgui-editors.cpp
@@ -34,7 +34,7 @@ StringView scenery_type_to_string(const scenery_& sc)
}
StringView scenery_path(const wall_info* wa) { return wa->atlas->name(); }
-StringView scenery_name(StringView, const scenery_& sc) { return sc.descr; }
+StringView scenery_name(StringView, const scenery_& sc) { return sc.name; }
StringView scenery_name(StringView, const vobj_& vobj) { return vobj.descr; }
StringView scenery_name(StringView, const wall_info* w) { return w->name; }
std::shared_ptr<anim_atlas> get_atlas(const scenery_& sc) { return sc.proto.atlas; }
diff --git a/editor/scenery-editor.hpp b/editor/scenery-editor.hpp
index 999e9e15..dec74b95 100644
--- a/editor/scenery-editor.hpp
+++ b/editor/scenery-editor.hpp
@@ -15,7 +15,7 @@ class scenery_editor final
{
public:
struct scenery_ final {
- String name, descr;
+ String name;
scenery_proto proto;
explicit operator bool() const noexcept;
};
diff --git a/editor/scenery-json.cpp b/editor/scenery-json.cpp
index e8b4dfec..7f832b0f 100644
--- a/editor/scenery-json.cpp
+++ b/editor/scenery-json.cpp
@@ -10,7 +10,7 @@ void scenery_editor::load_atlases()
{
_atlases.clear();
for (const auto& s : loader.sceneries())
- _atlases[s.name] = scenery_{s.name, s.descr, s.proto};
+ _atlases[s.name] = scenery_{s.name, s.proto};
}
} // namespace floormat