Support Undo&Redo for Multiselection operations

secsome · Apr 30, 2023 · 9f595d5 · 9f595d5
1 parent 9178119
commit 9f595d5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - Fixed the bug that lighting is not reset correctly when loading/creating a map
 - Fixed the bug that smudges and basenodes drifting away when resizing the map
 - Multiselection now supports copy & paste
+- Multiselection operations(raise or lower cells) now supports undo & redo
 - New ***ExtConfig*** : `ExtendedValidationNoError` = **BOOLEAN**, defaults to false
 
 ## RELEASE 1.5.2 (2023-03-03)

diff --git a/DOCUMENT.md b/DOCUMENT.md
@@ -9,8 +9,7 @@
 - For now, I cannot ensure the stability of it, so save your maps frequently before heavy loss! XD
 
 The multiple selection function is now available. Press Ctrl key to select tiles and press Ctrl+Shift key to deselect them. Ctrl+D can clear all selected tiles.
-Now this feature supports RaiseSingleTile/LowerSingleTile (though they are not "Single" anymore) and calucate selected area ore value.
-NOTICE THAT UNDOREDO AND COPYPASTE HASN'T BEEN SUPPORTED YET!
+Now this feature supports RaiseSingleTile/LowerSingleTile (though they are not "Single" anymore), copy paste, and calucating selected area ore value.
 
 ## BASIC TYPES
 - **INTEGER** 

diff --git a/FA2pp b/FA2pp
diff --git a/FA2sp/Miscs/MultiSelection.cpp b/FA2sp/Miscs/MultiSelection.cpp
@@ -330,13 +330,16 @@ DEFINE_HOOK(433DA0, CFinalSunDlg_Tools_RaiseSingleTile, 5)
     {
         if (MultiSelection::GetCount())
         {
+            CMapData::Instance->SaveUndoRedoData(true, 0, 0, 0, 0);
             MultiSelection::ApplyForEach(
                 [](CellData& cell) {
                     if (cell.Height < 14)
                         ++cell.Height;
                 }
             );
             pThis->MyViewFrame.pIsoView->RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW);
+            CMapData::Instance->SaveUndoRedoData(true, 0, 0, 0, 0);
+            CMapData::Instance->DoUndo();
         }
         else
         {
@@ -368,13 +371,16 @@ DEFINE_HOOK(433D30, CFinalSunDlg_Tools_LowerSingleTile, 5)
     {
         if (MultiSelection::GetCount())
         {
+            CMapData::Instance->SaveUndoRedoData(true, 0, 0, 0, 0);
             MultiSelection::ApplyForEach(
                 [](CellData& cell) {
                     if (cell.Height > 0)
                         --cell.Height;
                 }
             );
             pThis->MyViewFrame.pIsoView->RedrawWindow(nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW);
+            CMapData::Instance->SaveUndoRedoData(true, 0, 0, 0, 0);
+            CMapData::Instance->DoUndo();
         }
         else
         {