From 626e49662839a1ecd505547a5671d1ab8ac5b4aa Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 14 Feb 2024 18:29:13 +0100 Subject: wip --- editor/vobj-editor.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'editor/vobj-editor.cpp') diff --git a/editor/vobj-editor.cpp b/editor/vobj-editor.cpp index bfe88d71..0cfa64d6 100644 --- a/editor/vobj-editor.cpp +++ b/editor/vobj-editor.cpp @@ -22,7 +22,10 @@ void vobj_editor::clear_selection() { _selected = nullptr; } auto vobj_editor::get_selected() const -> const vobj_* { - return _selected; + if (_selected) + return _selected; + else + return {}; } auto vobj_editor::get_type(StringView name) -> const vobj_* @@ -91,13 +94,13 @@ std::shared_ptr light_factory::make(world& w, object_id id, global_coord return ret; } -auto vobj_editor::make_vobj_type_map() -> std::map +auto vobj_editor::make_vobj_type_map() -> std::map { constexpr auto add = [](auto& m, std::unique_ptr&& x) { StringView name = x->name(), descr = x->descr(); m[name] = vobj_editor::vobj_{ name, descr, std::move(x) }; }; - std::map map; + std::map map; add(map, std::make_unique()); return map; } -- cgit v1.2.3