#6303: Add/delete conversation entity commands are now undable

codereader · Jan 13, 2024 · cd0675d · cd0675d
1 parent 1fa67ff
commit cd0675d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/plugins/dm.conversation/ConversationDialog.cpp b/plugins/dm.conversation/ConversationDialog.cpp
@@ -276,11 +276,13 @@ void ConversationDialog::onAddEntity(wxCommandEvent& ev)
 
     if (eclass)
     {
+        UndoableCommand addEntityCommand("addConversationEntity");
+
         // Construct a Node of this entity type
         IEntityNodePtr node(GlobalEntityModule().createEntity(eclass));
 
         // Create a random offset
-		node->getEntity().setKeyValue(
+        node->getEntity().setKeyValue(
             "origin", RandomOrigin::generate(128)
         );
 

diff --git a/plugins/dm.conversation/ConversationEntity.cpp b/plugins/dm.conversation/ConversationEntity.cpp
@@ -5,6 +5,7 @@
 #include "i18n.h"
 #include "itextstream.h"
 #include "ientity.h"
+#include "iundo.h"
 
 #include "string/convert.h"
 
@@ -28,15 +29,17 @@ ConversationEntity::ConversationEntity(const scene::INodePtr& node) :
 }
 
 // Delete the entity's world node
-void ConversationEntity::deleteWorldNode() 
+void ConversationEntity::deleteWorldNode()
 {
-	// Try to convert the weak_ptr reference to a shared_ptr
-	scene::INodePtr node = _entityNode.lock();
+    UndoableCommand deleteCommand("removeConversationEntity");
 
-	if (node && node->getParent())
-	{
-		node->getParent()->removeChildNode(node);
-	}
+    // Try to convert the weak_ptr reference to a shared_ptr
+    auto node = _entityNode.lock();
+
+    if (node && node->getParent())
+    {
+        node->getParent()->removeChildNode(node);
+    }
 }
 
 int ConversationEntity::getHighestIndex()