From 8dfd87a738e617990d8ecea89e6f67cba9874ab7 Mon Sep 17 00:00:00 2001
From: Reinder Feenstra <reinderfeenstra@gmail.com>
Date: Thu, 16 Sep 2021 23:23:00 +0200
Subject: [PATCH] scriptlist: added remove method

---
 server/src/lua/scriptlist.cpp | 11 +++++++++++
 server/src/lua/scriptlist.hpp |  1 +
 2 files changed, 12 insertions(+)

diff --git a/server/src/lua/scriptlist.cpp b/server/src/lua/scriptlist.cpp
index 0f098f2d..bd9e8fdd 100644
--- a/server/src/lua/scriptlist.cpp
+++ b/server/src/lua/scriptlist.cpp
@@ -38,6 +38,13 @@ ScriptList::ScriptList(Object& _parent, const std::string& parentPropertyName) :
         return std::shared_ptr<Script>();
       return Script::create(world, world->getUniqueId("script"));
     }}
+  , remove{*this, "remove",
+    [this](const std::shared_ptr<Script>& script)
+    {
+      if(containsObject(script))
+        script->destroy();
+      assert(!containsObject(script));
+    }}
 {
   auto world = getWorld(&_parent);
   const bool editable = world && contains(world->state.value(), WorldState::Edit);
@@ -45,6 +52,10 @@ ScriptList::ScriptList(Object& _parent, const std::string& parentPropertyName) :
   Attributes::addDisplayName(add, DisplayName::List::add);
   Attributes::addEnabled(add, editable);
   m_interfaceItems.add(add);
+
+  Attributes::addDisplayName(remove, DisplayName::List::remove);
+  Attributes::addEnabled(remove, editable);
+  m_interfaceItems.add(remove);
 }
 
 TableModelPtr ScriptList::getModel()
diff --git a/server/src/lua/scriptlist.hpp b/server/src/lua/scriptlist.hpp
index 3fedcaf9..82cf69ef 100644
--- a/server/src/lua/scriptlist.hpp
+++ b/server/src/lua/scriptlist.hpp
@@ -39,6 +39,7 @@ class ScriptList : public ObjectList<Script>
     CLASS_ID("lua.script_list")
 
     ::Method<std::shared_ptr<Script>()> add;
+    ::Method<void(const std::shared_ptr<Script>&)> remove;
 
     ScriptList(Object& _parent, const std::string& parentPropertyName);