added support for undo/redo using Ctrl-z/Ctrl-Shift-z in level editor

diff --git a/src/editor.c b/src/editor.c
index 8175781421f3343dedb2b4023e599eb7ef5f943f..c8444b1158c22f1acf52c5c0e94814e46f956be2 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -12355,6 +12355,16 @@ void CopyBrushToClipboard_Small(void)
   CopyBrushExt(0, 0, 0, 0, 0, CB_BRUSH_TO_CLIPBOARD_SMALL);
 }
 
+void UndoLevelEditorOperation(void)
+{
+  ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], -1);
+}
+
+void RedoLevelEditorOperation(void)
+{
+  ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
+}
+
 static void FloodFill(int from_x, int from_y, int fill_element)
 {
   FloodFillLevel(from_x, from_y, fill_element, Feld, lev_fieldx, lev_fieldy);
@@ -13820,7 +13830,9 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       break;
 
     case GADGET_ID_UNDO:
-      if (button == 1 && GetKeyModState() & (KMOD_Shift|KMOD_Control))
+      if (button < 0)  // keep button value (even if modifier keys are pressed)
+       button = -button;
+      else if (button == 1 && GetKeyModState() & (KMOD_Shift | KMOD_Control))
        button = 3;
 
       if (button == 1 && undo_buffer_steps == 0)

diff --git a/src/editor.h b/src/editor.h
index 09c2ccac57875ced2ed048fbf31597004e064e9d..19791965c96c701ad82e815ec7c10a79851b12e7 100644 (file)
--- a/src/editor.h
+++ b/src/editor.h
@@ -31,4 +31,7 @@ void CopyClipboardToBrush(void);
 void CopyBrushToClipboard(void);
 void CopyBrushToClipboard_Small(void);
 
+void UndoLevelEditorOperation(void);
+void RedoLevelEditorOperation(void);
+
 #endif

diff --git a/src/events.c b/src/events.c
index 085dd9ff4c3c3fccf9a875a2e878de96ced3e0b5..9526f198b7c3e228b4f13e1834eab148d07c4fd9 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -1910,6 +1910,13 @@ static void HandleKeysSpecial(Key key)
       {
        CopyClipboardToBrush();
       }
+      else if (letter == 'z')  // undo or redo last operation
+      {
+       if (GetKeyModState() & KMOD_Shift)
+         RedoLevelEditorOperation();
+       else
+         UndoLevelEditorOperation();
+      }
     }
   }