"Added UI Buttons for reordering"

Author: CookieLandProjects

.gitignore

@@ -66,4 +66,5 @@ build.ninja
 
 ## Python
 __pycache__/
-*.pyc
+*.pyc
+/GeneralsMD/Code/Tools/WorldBuilder/res/RCa20376

GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h

@@ -147,6 +147,7 @@ class ScriptGroup : public MemoryPoolObject, public Snapshot
 
 	void addScript(Script *pScr, Int ndx);
 	void deleteScript(Script *pScr);
+	void removeScript(Script* pScr);
 
 	static void WriteGroupDataChunk(DataChunkOutput &chunkWriter, ScriptGroup *pGroup);
 	static Bool ParseGroupDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
@@ -1280,8 +1281,13 @@ class ScriptList : public MemoryPoolObject, public Snapshot
 	static Bool ParseScriptListDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
 
 	void addGroup(ScriptGroup *pGrp, Int ndx);
+	void updateParentIndicesAfterInsert(int insertPos);
+	void updateParentIndicesAfterDelete(int deletedPos);
 	void addScript(Script *pScr, Int ndx);
 	void deleteScript(Script *pScr);
+	void removeScript(Script* pScr);
+	void insertGroup(ScriptGroup* pGrp, ScriptGroup* insertAfter);
+	void unlinkGroup(ScriptGroup* pGrp);
 	void deleteGroup(ScriptGroup *pGrp);
 
 	void discard();

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp

@@ -420,19 +420,45 @@ void ScriptList::discard()
 	deleteInstance(this);
 }
 
+void ScriptList::updateParentIndicesAfterDelete(int deletedPos)
+{
+	ScriptGroup* g = m_firstGroup;
+	while (g)
+	{
+		int parent = g->getParentIndex();
+		if (parent > deletedPos)
+		{
+			g->setParentIndex(parent - 1);
+		}
+		g = g->getNext();
+	}
+}
+
+void ScriptList::updateParentIndicesAfterInsert(int insertPos)
+{
+	for (ScriptGroup* g = m_firstGroup; g; g = g->getNext())
+	{
+		Int p = g->getParentIndex();
+		if (p >= insertPos)
+			g->setParentIndex(p + 1);
+	}
+}
+
 /**
   Add a script group to the current list of groups.  Offset to position ndx.
 */
 void ScriptList::addGroup(ScriptGroup *pGrp, Int ndx)
 {
 	ScriptGroup *pPrev = nullptr;
 	ScriptGroup *pCur = m_firstGroup;
+	Int originalNdx = ndx;
 	DEBUG_ASSERTCRASH(pGrp->getNext()==nullptr, ("Adding already linked group."));
 	while (ndx && pCur) {
 		pPrev = pCur;
 		pCur = pCur->getNext();
 		ndx--;
 	}
+	int insertPos = originalNdx - ndx;
 	if (pPrev) {
 		// Weave into prev link.
 		pGrp->setNextGroup(pPrev->getNext());
@@ -442,6 +468,7 @@ void ScriptList::addGroup(ScriptGroup *pGrp, Int ndx)
 		pGrp->setNextGroup(m_firstGroup);
 		m_firstGroup = pGrp;
 	}
+	updateParentIndicesAfterInsert(insertPos);
 }
 
 /**
@@ -466,6 +493,107 @@ void ScriptList::addScript(Script *pScr, Int ndx)
 	}
 }
 
+void ScriptList::unlinkGroup(ScriptGroup* pGrp)
+{
+	if (pGrp == nullptr) return;
+
+	int deletedPos = 0;
+	ScriptGroup* pPrev = nullptr;
+	ScriptGroup* pCur = m_firstGroup;
+	while (pCur && pCur != pGrp)
+	{
+		pPrev = pCur;
+		pCur = pCur->getNext();
+		++deletedPos;
+	}
+	if (pCur == nullptr) return;
+
+	if (pPrev)
+		pPrev->setNextGroup(pCur->getNext());
+	else
+		m_firstGroup = pCur->getNext();
+
+	pCur->setNextGroup(nullptr);
+
+	updateParentIndicesAfterDelete(deletedPos);
+}
+
+void ScriptList::insertGroup(ScriptGroup* pGrp, ScriptGroup* insertAfter)
+{
+	if (pGrp == nullptr) return;
+	pGrp->setNextGroup(nullptr);
+
+	int insertPos = 0;
+	if (insertAfter == nullptr)
+	{
+		insertPos = 0;
+	}
+	else
+	{
+		ScriptGroup* cur = m_firstGroup;
+		while (cur && cur != insertAfter)
+		{
+			cur = cur->getNext();
+			++insertPos;
+		}
+		if (cur == nullptr) return;
+		++insertPos;
+	}
+
+	if (insertAfter == nullptr)
+	{
+		pGrp->setNextGroup(m_firstGroup);
+		m_firstGroup = pGrp;
+	}
+	else
+	{
+		pGrp->setNextGroup(insertAfter->getNext());
+		insertAfter->setNextGroup(pGrp);
+	}
+	updateParentIndicesAfterInsert(insertPos);
+}
+
+void ScriptList::removeScript(Script* pScr)
+{
+	Script* pPrev = nullptr;
+	Script* pCur = m_firstScript;
+	while (pCur && pCur != pScr) {
+		pPrev = pCur;
+		pCur = pCur->getNext();
+	}
+	DEBUG_ASSERTCRASH(pCur, ("Couldn't find script."));
+	if (pCur == nullptr) return;
+
+	if (pPrev) {
+		pPrev->setNextScript(pCur->getNext());
+	}
+	else {
+		m_firstScript = pCur->getNext();
+	}
+	pCur->setNextScript(nullptr);
+}
+
+void ScriptGroup::removeScript(Script* pScr)
+{
+	Script* pPrev = nullptr;
+	Script* pCur = m_firstScript;
+	while (pCur && pCur != pScr) {
+		pPrev = pCur;
+		pCur = pCur->getNext();
+	}
+	DEBUG_ASSERTCRASH(pCur, ("Couldn't find script."));
+	if (pCur == nullptr) return;
+
+	if (pPrev) {
+		pPrev->setNextScript(pCur->getNext());
+	}
+	else {
+		m_firstScript = pCur->getNext();
+	}
+	// Detach but DO NOT delete instance (caller will re-insert or delete later).
+	pCur->setNextScript(nullptr);
+}
+
 /**
   Delete a script from the current list of scripts.
 */

GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h

@@ -76,6 +76,7 @@ class ScriptDialog : public CDialog
 	//{{AFX_VIRTUAL(ScriptDialog)
 	protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -136,6 +137,8 @@ class ScriptDialog : public CDialog
 	static Bool ParseTeamsDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
 	static Bool ParsePlayersDataChunk(DataChunkInput &file, DataChunkInfo *info, void *userData);
 
+	void moveSelected(bool up);
+
 protected:
 
 	// Generated message map functions
@@ -160,6 +163,9 @@ class ScriptDialog : public CDialog
 	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
 	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
 	afx_msg void OnMove(int x, int y);
+
+	afx_msg void OnMoveUp();
+	afx_msg void OnMoveDown();
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };

GeneralsMD/Code/Tools/WorldBuilder/res/WorldBuilder.rc

@@ -942,6 +942,10 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,403,7,50,14
     PUSHBUTTON      "New &Script...",IDC_NEW_SCRIPT,403,62,50,14
     PUSHBUTTON      "&Edit...",IDC_EDIT_SCRIPT,403,78,50,14
+
+    PUSHBUTTON      "Up",IDC_MOVE_UP,403,118,25,14
+    PUSHBUTTON      "Down",IDC_MOVE_DOWN,428,118,25,14
+
     PUSHBUTTON      "&Copy Script",IDC_COPY_SCRIPT,403,136,50,14
     PUSHBUTTON      "&Delete",IDC_DELETE,403,152,50,14
     PUSHBUTTON      "Import Scripts...",IDC_LOAD,386,309,60,14