editor: now use bptr<object>::destroy()

sthalik · Aug 9, 2024 · 1bbdbb8 · 1bbdbb8
1 parent d2917b6
commit 1bbdbb8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/editor/imgui.cpp b/editor/imgui.cpp
@@ -338,7 +338,7 @@ void app::do_popup_menu()
 {
     const auto [id, target] = _popup_target;
     auto& w = M->world();
-    const auto eʹ = w.find_object(id);
+    auto eʹ = w.find_object(id);
 
     if (target == popup_target_type::none || !eʹ)
     {
@@ -394,6 +394,7 @@ void app::do_popup_menu()
             e.chunk().remove_object(e.index());
             e.destroy_script_post();
             e.gone = true;
+            eʹ.destroy();
         }
     }
     else

diff --git a/editor/scenery-editor.cpp b/editor/scenery-editor.cpp
@@ -93,12 +93,14 @@ void scenery_editor::place_tile(world& w, global_coords pos, const scenery_& s,
         while (auto id = a.get_object_colliding_with_cursor())
         {
             for (auto i = 0uz; i < sz; i++)
-                if (const auto eʹ = es[i]; eʹ->id == id)
+                if (auto eʹ = es[i]; eʹ->id == id)
                 {
-                    eʹ->destroy_script_pre(eʹ, script_destroy_reason::kill);
+                    auto& e = *eʹ;
+                    e.destroy_script_pre(eʹ, script_destroy_reason::kill);
                     c.remove_object(i);
-                    eʹ->destroy_script_post();
-                    eʹ->gone = true;
+                    e.destroy_script_post();
+                    e.gone = true;
+                    eʹ.destroy();
                     goto start;
                 }
             break;

diff --git a/editor/vobj-editor.cpp b/editor/vobj-editor.cpp
@@ -54,13 +54,15 @@ void vobj_editor::place_tile(world& w, global_coords pos, const vobj_* x, struct
         {
             for (auto i = (int)(es.size()-1); i >= 0; i--)
             {
-                const auto eʹ = es[i];
-                if (eʹ->id == id && eʹ->is_virtual())
+                auto eʹ = es[i];
+                auto& e = *eʹ;
+                if (e.id == id && eʹ->is_virtual())
                 {
-                    eʹ->destroy_script_pre(eʹ, script_destroy_reason::kill);
+                    e.destroy_script_pre(eʹ, script_destroy_reason::kill);
                     c.remove_object((unsigned)i);
-                    eʹ->destroy_script_post();
-                    eʹ->gone = true;
+                    e.destroy_script_post();
+                    e.gone = true;
+                    eʹ.destroy();
                     goto start;
                 }
             }

diff --git a/src/chunk.cpp b/src/chunk.cpp
@@ -196,7 +196,6 @@ void chunk::remove_object(size_t i)
 
     }
     arrayRemove(_objects, i);
-    //eʹ.destroy();
 }
 
 ArrayView<const bptr<object>> chunk::objects() const
-Original file line number
+Diff line change
@@ Expand Up / @@ -196,7 +196,6 @@ void chunk::remove_object(size_t i) @@
         }
         arrayRemove(_objects, i);
-        //eʹ.destroy();
     }
     ArrayView<const bptr<object>> chunk::objects() const
@@ Expand Down @@