From 45e2d53abaacdaae9d00b5e989219b045f0540dc Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 21 May 2024 09:28:24 +0200 Subject: start thinking about composite objects --- editor/imgui.cpp | 1 + editor/scenery-editor.cpp | 1 + editor/vobj-editor.cpp | 1 + 3 files changed, 3 insertions(+) (limited to 'editor') diff --git a/editor/imgui.cpp b/editor/imgui.cpp index c8b0dcbd..b548d527 100644 --- a/editor/imgui.cpp +++ b/editor/imgui.cpp @@ -392,6 +392,7 @@ void app::do_popup_menu() e.destroy_script_pre(eʹ, script_destroy_reason::kill); e.chunk().remove_object(e.index()); e.destroy_script_post(); + e.gone = true; } } else diff --git a/editor/scenery-editor.cpp b/editor/scenery-editor.cpp index b472fca5..2c205e3e 100644 --- a/editor/scenery-editor.cpp +++ b/editor/scenery-editor.cpp @@ -99,6 +99,7 @@ start: eʹ->destroy_script_pre(eʹ, script_destroy_reason::kill); c.remove_object(i); eʹ->destroy_script_post(); + eʹ->gone = true; goto start; } break; diff --git a/editor/vobj-editor.cpp b/editor/vobj-editor.cpp index d3eb7bc5..e82c6d27 100644 --- a/editor/vobj-editor.cpp +++ b/editor/vobj-editor.cpp @@ -59,6 +59,7 @@ start: while (auto id = a.get_object_colliding_with_cursor()) eʹ->destroy_script_pre(eʹ, script_destroy_reason::kill); c.remove_object((unsigned)i); eʹ->destroy_script_post(); + eʹ->gone = true; goto start; } } -- cgit v1.2.3