properly handle right-click delete

scp-fs2open · Oct 19, 2023 · 44e875c · 44e875c
1 parent 87c8828
commit 44e875c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/fred2/missioncutscenesdlg.cpp b/fred2/missioncutscenesdlg.cpp
@@ -51,7 +51,7 @@ CMissionCutscenesDlg::CMissionCutscenesDlg(CWnd* pParent /*=NULL*/)
 	m_name = _T("");
 	m_desc = _T("");
 	//}}AFX_DATA_INIT
-	m_cutscenes_tree.m_mode = MODE_GOALS; // We don't need to perform actions here, so use the same method as Goals
+	m_cutscenes_tree.m_mode = MODE_CUTSCENES; // We don't need to perform actions here, so use the same method as Goals
 	m_cutscenes_tree.link_modified(&modified);
 	modified = 0;
 	select_sexp_node = -1;
@@ -226,7 +226,7 @@ void CMissionCutscenesDlg::update_cur_cutscene()
 // handler for context menu (i.e. a right mouse button click).
 void CMissionCutscenesDlg::OnRclickCutscenesTree(NMHDR* pNMHDR, LRESULT* pResult)
 {
-	m_cutscenes_tree.right_clicked(MODE_GOALS); // We don't need to perform actions here, so use the same method as Goals
+	m_cutscenes_tree.right_clicked(MODE_CUTSCENES); // We don't need to perform actions here, so use the same method as Goals
 	*pResult = 0;
 }
 

diff --git a/fred2/sexp_tree.cpp b/fred2/sexp_tree.cpp
@@ -2592,6 +2592,10 @@ void sexp_tree::NodeDelete()
 			Assert(Goal_editor_dlg);
 			theNode = Goal_editor_dlg->handler(ROOT_DELETED, item_index);
 
+		}else if (m_mode == MODE_CUTSCENES) {
+			Assert(Cutscene_editor_dlg);
+			theNode = Cutscene_editor_dlg->handler(ROOT_DELETED, item_index);
+
 		} else if (m_mode == MODE_EVENTS) {
 			Assert(Event_editor_dlg);
 			theNode = Event_editor_dlg->handler(ROOT_DELETED, item_index);

diff --git a/fred2/sexp_tree.h b/fred2/sexp_tree.h
@@ -73,6 +73,7 @@
 #define MODE_GOALS		(1 | ST_LABELED_ROOT | ST_ROOT_DELETABLE)
 #define MODE_EVENTS		(2 | ST_LABELED_ROOT | ST_ROOT_DELETABLE | ST_ROOT_EDITABLE)
 #define MODE_CAMPAIGN	(3 | ST_LABELED_ROOT | ST_ROOT_DELETABLE)
+#define MODE_CUTSCENES	(4 | ST_LABELED_ROOT | ST_ROOT_DELETABLE)
 
 // various tree operations notification codes (to be handled by derived class)
 #define ROOT_DELETED	1