From: Holger Schemel <info@artsoft.org>
Date: Fri, 24 Feb 2023 19:51:53 +0000 (+0100)
Subject: fixed rotating MM game elements in editor with pressed Shift key
X-Git-Tag: 4.3.5.2~25
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=d85cc2b1268d6d62ceab1c5105450ab64001b1d1;p=rocksndiamonds.git

fixed rotating MM game elements in editor with pressed Shift key

When holding the Shift key pressed, MM style rotatable game elements
can be rotated on the playfield (instead of drawing with the element
selected for this mouse button). However, if the drawing element is
an MM style wall, this element is placed on the playfield instead of
rotating the existing element on the playfield.

This usually happened when editing a level using the MM game engine
and trying to rotate an existing element to the right using the right
mouse button, as the default drawing element for the right mouse
button is the wooden MM style wall.

This change fixes this problem, so all three mouse button can now
be used to rotate elements on the playfield, regardless of current
drawing element.
---

diff --git a/src/editor.c b/src/editor.c
index 10ff5a7f..644294a4 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -11136,7 +11136,7 @@ static void MergeAndCloseNeighbourElements(int x1, int y1, int *element1,
   SetElementSimple(x2, y2, *element2, change_level);
 }
 
-static void SetElementIntelliDraw(int x, int y, int new_element,
+static void SetElementIntelliDraw(int x, int y, int dx, int dy, int new_element,
 				  boolean change_level, int button)
 {
   struct XY *xy = xy_directions;
@@ -11908,7 +11908,10 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     }
   }
 
-  SetElementSimple(x, y, new_element, change_level);
+  if (IS_MM_WALL_EDITOR(new_element))
+    SetElementSimpleExt(x, y, dx, dy, new_element, change_level);
+  else
+    SetElementSimple(x, y, new_element, change_level);
 
   last_x = x;
   last_y = y;
@@ -11922,7 +11925,7 @@ static void ResetIntelliDraw(void)
     for (y = 0; y < lev_fieldy; y++)
       IntelliDrawBuffer[x][y] = Tile[x][y];
 
-  SetElementIntelliDraw(-1, -1, EL_UNDEFINED, FALSE, -1);
+  SetElementIntelliDraw(-1, -1, -1, -1, EL_UNDEFINED, FALSE, -1);
 }
 
 static boolean draw_mode_hires = FALSE;
@@ -11964,8 +11967,8 @@ static void SetElementExt(int x, int y, int dx, int dy, int element,
 {
   if (element < 0)
     SetElementSimple(x, y, Tile[x][y], change_level);
-  else if (GetKeyModState() & KMOD_Shift && !IS_MM_WALL_EDITOR(element))
-    SetElementIntelliDraw(x, y, element, change_level, button);
+  else if (GetKeyModState() & KMOD_Shift)
+    SetElementIntelliDraw(x, y, dx, dy, element, change_level, button);
   else
     SetElementSimpleExt(x, y, dx, dy, element, change_level);
 }