added flipping and rotating tiles in brushes in level editor
[rocksndiamonds.git] / src / editor.c
index d7aa2122adf1aa99147053bbe166d2af76571c3e..c01689237136127918ef39267e0e587b895e1c9f 100644 (file)
@@ -12345,6 +12345,9 @@ static void SelectArea(int from_x, int from_y, int to_x, int to_y,
 #define CB_BRUSH_TO_CLIPBOARD          7
 #define CB_BRUSH_TO_CLIPBOARD_SMALL    8
 #define CB_UPDATE_BRUSH_POSITION       9
+#define CB_FLIP_BRUSH_X                        10
+#define CB_FLIP_BRUSH_Y                        11
+#define CB_FLIP_BRUSH_XY               12
 
 #define MAX_CB_PART_SIZE       10
 #define MAX_CB_LINE_SIZE       (MAX_LEV_FIELDX + 1)    // text plus newline
@@ -12353,6 +12356,321 @@ static void SelectArea(int from_x, int from_y, int to_x, int to_y,
                                 MAX_CB_NUM_LINES *     \
                                 MAX_CB_PART_SIZE)
 
+static int getFlippedTileX(int element)
+{
+  switch (element)
+  {
+    case EL_BD_BUTTERFLY_LEFT:         return EL_BD_BUTTERFLY_RIGHT;
+    case EL_BD_BUTTERFLY_RIGHT:                return EL_BD_BUTTERFLY_LEFT;
+
+    case EL_BD_FIREFLY_LEFT:           return EL_BD_FIREFLY_RIGHT;
+    case EL_BD_FIREFLY_RIGHT:          return EL_BD_FIREFLY_LEFT;
+
+    case EL_BUG_LEFT:                  return EL_BUG_RIGHT;
+    case EL_BUG_RIGHT:                 return EL_BUG_LEFT;
+
+    case EL_SPACESHIP_LEFT:            return EL_SPACESHIP_RIGHT;
+    case EL_SPACESHIP_RIGHT:           return EL_SPACESHIP_LEFT;
+
+    case EL_PACMAN_LEFT:               return EL_PACMAN_RIGHT;
+    case EL_PACMAN_RIGHT:              return EL_PACMAN_LEFT;
+
+    case EL_ARROW_LEFT:                        return EL_ARROW_RIGHT;
+    case EL_ARROW_RIGHT:               return EL_ARROW_LEFT;
+
+    case EL_MOLE_LEFT:                 return EL_MOLE_RIGHT;
+    case EL_MOLE_RIGHT:                        return EL_MOLE_LEFT;
+
+    case EL_BALLOON_SWITCH_LEFT:       return EL_BALLOON_SWITCH_RIGHT;
+    case EL_BALLOON_SWITCH_RIGHT:      return EL_BALLOON_SWITCH_LEFT;
+
+    case EL_YAMYAM_LEFT:               return EL_YAMYAM_RIGHT;
+    case EL_YAMYAM_RIGHT:              return EL_YAMYAM_LEFT;
+
+    case EL_SP_PORT_LEFT:              return EL_SP_PORT_RIGHT;
+    case EL_SP_PORT_RIGHT:             return EL_SP_PORT_LEFT;
+
+    case EL_SP_GRAVITY_PORT_LEFT:      return EL_SP_GRAVITY_PORT_RIGHT;
+    case EL_SP_GRAVITY_PORT_RIGHT:     return EL_SP_GRAVITY_PORT_LEFT;
+
+    case EL_SP_GRAVITY_ON_PORT_LEFT:   return EL_SP_GRAVITY_ON_PORT_RIGHT;
+    case EL_SP_GRAVITY_ON_PORT_RIGHT:  return EL_SP_GRAVITY_ON_PORT_LEFT;
+
+    case EL_SP_GRAVITY_OFF_PORT_LEFT:  return EL_SP_GRAVITY_OFF_PORT_RIGHT;
+    case EL_SP_GRAVITY_OFF_PORT_RIGHT: return EL_SP_GRAVITY_OFF_PORT_LEFT;
+
+    case EL_CONVEYOR_BELT_1_LEFT:      return EL_CONVEYOR_BELT_1_RIGHT;
+    case EL_CONVEYOR_BELT_1_RIGHT:     return EL_CONVEYOR_BELT_1_LEFT;
+
+    case EL_CONVEYOR_BELT_2_LEFT:      return EL_CONVEYOR_BELT_2_RIGHT;
+    case EL_CONVEYOR_BELT_2_RIGHT:     return EL_CONVEYOR_BELT_2_LEFT;
+
+    case EL_CONVEYOR_BELT_3_LEFT:      return EL_CONVEYOR_BELT_3_RIGHT;
+    case EL_CONVEYOR_BELT_3_RIGHT:     return EL_CONVEYOR_BELT_3_LEFT;
+
+    case EL_CONVEYOR_BELT_4_LEFT:      return EL_CONVEYOR_BELT_4_RIGHT;
+    case EL_CONVEYOR_BELT_4_RIGHT:     return EL_CONVEYOR_BELT_4_LEFT;
+
+    case EL_SPRING_LEFT:               return EL_SPRING_RIGHT;
+    case EL_SPRING_RIGHT:              return EL_SPRING_LEFT;
+
+    case EL_SP_CHIP_LEFT:              return EL_SP_CHIP_RIGHT;
+    case EL_SP_CHIP_RIGHT:             return EL_SP_CHIP_LEFT;
+
+    case EL_TUBE_VERTICAL_LEFT:                return EL_TUBE_VERTICAL_RIGHT;
+    case EL_TUBE_VERTICAL_RIGHT:       return EL_TUBE_VERTICAL_LEFT;
+    case EL_TUBE_LEFT_UP:              return EL_TUBE_RIGHT_UP;
+    case EL_TUBE_LEFT_DOWN:            return EL_TUBE_RIGHT_DOWN;
+    case EL_TUBE_RIGHT_UP:             return EL_TUBE_LEFT_UP;
+    case EL_TUBE_RIGHT_DOWN:           return EL_TUBE_LEFT_DOWN;
+
+    case EL_DC_STEELWALL_1_LEFT:       return EL_DC_STEELWALL_1_RIGHT;
+    case EL_DC_STEELWALL_1_RIGHT:      return EL_DC_STEELWALL_1_LEFT;
+    case EL_DC_STEELWALL_1_TOPLEFT:    return EL_DC_STEELWALL_1_TOPRIGHT;
+    case EL_DC_STEELWALL_1_TOPRIGHT:   return EL_DC_STEELWALL_1_TOPLEFT;
+    case EL_DC_STEELWALL_1_BOTTOMLEFT: return EL_DC_STEELWALL_1_BOTTOMRIGHT;
+    case EL_DC_STEELWALL_1_BOTTOMRIGHT:        return EL_DC_STEELWALL_1_BOTTOMLEFT;
+    case EL_DC_STEELWALL_1_TOPLEFT_2:  return EL_DC_STEELWALL_1_TOPRIGHT_2;
+    case EL_DC_STEELWALL_1_TOPRIGHT_2: return EL_DC_STEELWALL_1_TOPLEFT_2;
+    case EL_DC_STEELWALL_1_BOTTOMLEFT_2: return EL_DC_STEELWALL_1_BOTTOMRIGHT_2;
+    case EL_DC_STEELWALL_1_BOTTOMRIGHT_2: return EL_DC_STEELWALL_1_BOTTOMLEFT_2;
+
+    case EL_DC_STEELWALL_2_LEFT:       return EL_DC_STEELWALL_2_RIGHT;
+    case EL_DC_STEELWALL_2_RIGHT:      return EL_DC_STEELWALL_2_LEFT;
+
+    case EL_ACID_POOL_TOPLEFT:         return EL_ACID_POOL_TOPRIGHT;
+    case EL_ACID_POOL_TOPRIGHT:                return EL_ACID_POOL_TOPLEFT;
+    case EL_ACID_POOL_BOTTOMLEFT:      return EL_ACID_POOL_BOTTOMRIGHT;
+    case EL_ACID_POOL_BOTTOMRIGHT:     return EL_ACID_POOL_BOTTOMLEFT;
+  }
+
+  return element;
+}
+
+static int getFlippedTileY(int element)
+{
+  switch (element)
+  {
+    case EL_BD_BUTTERFLY_UP:           return EL_BD_BUTTERFLY_DOWN;
+    case EL_BD_BUTTERFLY_DOWN:         return EL_BD_BUTTERFLY_UP;
+
+    case EL_BD_FIREFLY_UP:             return EL_BD_FIREFLY_DOWN;
+    case EL_BD_FIREFLY_DOWN:           return EL_BD_FIREFLY_UP;
+
+    case EL_BUG_UP:                    return EL_BUG_DOWN;
+    case EL_BUG_DOWN:                  return EL_BUG_UP;
+
+    case EL_SPACESHIP_UP:              return EL_SPACESHIP_DOWN;
+    case EL_SPACESHIP_DOWN:            return EL_SPACESHIP_UP;
+
+    case EL_PACMAN_UP:                 return EL_PACMAN_DOWN;
+    case EL_PACMAN_DOWN:               return EL_PACMAN_UP;
+
+    case EL_ARROW_UP:                  return EL_ARROW_DOWN;
+    case EL_ARROW_DOWN:                        return EL_ARROW_UP;
+
+    case EL_MOLE_UP:                   return EL_MOLE_DOWN;
+    case EL_MOLE_DOWN:                 return EL_MOLE_UP;
+
+    case EL_BALLOON_SWITCH_UP:         return EL_BALLOON_SWITCH_DOWN;
+    case EL_BALLOON_SWITCH_DOWN:       return EL_BALLOON_SWITCH_UP;
+
+    case EL_YAMYAM_UP:                 return EL_YAMYAM_DOWN;
+    case EL_YAMYAM_DOWN:               return EL_YAMYAM_UP;
+
+    case EL_SP_PORT_UP:                        return EL_SP_PORT_DOWN;
+    case EL_SP_PORT_DOWN:              return EL_SP_PORT_UP;
+
+    case EL_SP_GRAVITY_PORT_UP:                return EL_SP_GRAVITY_PORT_DOWN;
+    case EL_SP_GRAVITY_PORT_DOWN:      return EL_SP_GRAVITY_PORT_UP;
+
+    case EL_SP_GRAVITY_ON_PORT_UP:     return EL_SP_GRAVITY_ON_PORT_DOWN;
+    case EL_SP_GRAVITY_ON_PORT_DOWN:   return EL_SP_GRAVITY_ON_PORT_UP;
+
+    case EL_SP_GRAVITY_OFF_PORT_UP:    return EL_SP_GRAVITY_OFF_PORT_DOWN;
+    case EL_SP_GRAVITY_OFF_PORT_DOWN:  return EL_SP_GRAVITY_OFF_PORT_UP;
+
+    case EL_SP_CHIP_TOP:               return EL_SP_CHIP_BOTTOM;
+    case EL_SP_CHIP_BOTTOM:            return EL_SP_CHIP_TOP;
+
+    case EL_TUBE_HORIZONTAL_UP:                return EL_TUBE_HORIZONTAL_DOWN;
+    case EL_TUBE_HORIZONTAL_DOWN:      return EL_TUBE_HORIZONTAL_UP;
+    case EL_TUBE_LEFT_UP:              return EL_TUBE_LEFT_DOWN;
+    case EL_TUBE_LEFT_DOWN:            return EL_TUBE_LEFT_UP;
+    case EL_TUBE_RIGHT_UP:             return EL_TUBE_RIGHT_DOWN;
+    case EL_TUBE_RIGHT_DOWN:           return EL_TUBE_RIGHT_UP;
+
+    case EL_DC_STEELWALL_1_TOP:                return EL_DC_STEELWALL_1_BOTTOM;
+    case EL_DC_STEELWALL_1_BOTTOM:     return EL_DC_STEELWALL_1_TOP;
+    case EL_DC_STEELWALL_1_TOPLEFT:    return EL_DC_STEELWALL_1_BOTTOMLEFT;
+    case EL_DC_STEELWALL_1_TOPRIGHT:   return EL_DC_STEELWALL_1_BOTTOMRIGHT;
+    case EL_DC_STEELWALL_1_BOTTOMLEFT: return EL_DC_STEELWALL_1_TOPLEFT;
+    case EL_DC_STEELWALL_1_BOTTOMRIGHT:        return EL_DC_STEELWALL_1_TOPRIGHT;
+    case EL_DC_STEELWALL_1_TOPLEFT_2:  return EL_DC_STEELWALL_1_BOTTOMLEFT_2;
+    case EL_DC_STEELWALL_1_TOPRIGHT_2: return EL_DC_STEELWALL_1_BOTTOMRIGHT_2;
+    case EL_DC_STEELWALL_1_BOTTOMLEFT_2: return EL_DC_STEELWALL_1_TOPLEFT_2;
+    case EL_DC_STEELWALL_1_BOTTOMRIGHT_2: return EL_DC_STEELWALL_1_TOPRIGHT_2;
+
+    case EL_DC_STEELWALL_2_TOP:                return EL_DC_STEELWALL_2_BOTTOM;
+    case EL_DC_STEELWALL_2_BOTTOM:     return EL_DC_STEELWALL_2_TOP;
+
+    case EL_EMC_WALL_1:                        return EL_EMC_WALL_3;
+    case EL_EMC_WALL_3:                        return EL_EMC_WALL_1;
+  }
+
+  return element;
+}
+
+static int getFlippedTileXY(int element)
+{
+  switch (element)
+  {
+    case EL_BD_BUTTERFLY_LEFT:         return EL_BD_BUTTERFLY_UP;
+    case EL_BD_BUTTERFLY_RIGHT:                return EL_BD_BUTTERFLY_DOWN;
+    case EL_BD_BUTTERFLY_UP:           return EL_BD_BUTTERFLY_LEFT;
+    case EL_BD_BUTTERFLY_DOWN:         return EL_BD_BUTTERFLY_RIGHT;
+
+    case EL_BD_FIREFLY_LEFT:           return EL_BD_FIREFLY_UP;
+    case EL_BD_FIREFLY_RIGHT:          return EL_BD_FIREFLY_DOWN;
+    case EL_BD_FIREFLY_UP:             return EL_BD_FIREFLY_LEFT;
+    case EL_BD_FIREFLY_DOWN:           return EL_BD_FIREFLY_RIGHT;
+
+    case EL_BUG_LEFT:                  return EL_BUG_UP;
+    case EL_BUG_RIGHT:                 return EL_BUG_DOWN;
+    case EL_BUG_UP:                    return EL_BUG_LEFT;
+    case EL_BUG_DOWN:                  return EL_BUG_RIGHT;
+
+    case EL_SPACESHIP_LEFT:            return EL_SPACESHIP_UP;
+    case EL_SPACESHIP_RIGHT:           return EL_SPACESHIP_DOWN;
+    case EL_SPACESHIP_UP:              return EL_SPACESHIP_LEFT;
+    case EL_SPACESHIP_DOWN:            return EL_SPACESHIP_RIGHT;
+
+    case EL_PACMAN_LEFT:               return EL_PACMAN_UP;
+    case EL_PACMAN_RIGHT:              return EL_PACMAN_DOWN;
+    case EL_PACMAN_UP:                 return EL_PACMAN_LEFT;
+    case EL_PACMAN_DOWN:               return EL_PACMAN_RIGHT;
+
+    case EL_ARROW_LEFT:                        return EL_ARROW_UP;
+    case EL_ARROW_RIGHT:               return EL_ARROW_DOWN;
+    case EL_ARROW_UP:                  return EL_ARROW_LEFT;
+    case EL_ARROW_DOWN:                        return EL_ARROW_RIGHT;
+
+    case EL_MOLE_LEFT:                 return EL_MOLE_UP;
+    case EL_MOLE_RIGHT:                        return EL_MOLE_DOWN;
+    case EL_MOLE_UP:                   return EL_MOLE_LEFT;
+    case EL_MOLE_DOWN:                 return EL_MOLE_RIGHT;
+
+    case EL_BALLOON_SWITCH_LEFT:       return EL_BALLOON_SWITCH_UP;
+    case EL_BALLOON_SWITCH_RIGHT:      return EL_BALLOON_SWITCH_DOWN;
+    case EL_BALLOON_SWITCH_UP:         return EL_BALLOON_SWITCH_LEFT;
+    case EL_BALLOON_SWITCH_DOWN:       return EL_BALLOON_SWITCH_RIGHT;
+
+    case EL_YAMYAM_LEFT:               return EL_YAMYAM_UP;
+    case EL_YAMYAM_RIGHT:              return EL_YAMYAM_DOWN;
+    case EL_YAMYAM_UP:                 return EL_YAMYAM_LEFT;
+    case EL_YAMYAM_DOWN:               return EL_YAMYAM_RIGHT;
+
+    case EL_SP_PORT_LEFT:              return EL_SP_PORT_UP;
+    case EL_SP_PORT_RIGHT:             return EL_SP_PORT_DOWN;
+    case EL_SP_PORT_UP:                        return EL_SP_PORT_LEFT;
+    case EL_SP_PORT_DOWN:              return EL_SP_PORT_RIGHT;
+
+    case EL_SP_GRAVITY_PORT_LEFT:      return EL_SP_GRAVITY_PORT_UP;
+    case EL_SP_GRAVITY_PORT_RIGHT:     return EL_SP_GRAVITY_PORT_DOWN;
+    case EL_SP_GRAVITY_PORT_UP:                return EL_SP_GRAVITY_PORT_LEFT;
+    case EL_SP_GRAVITY_PORT_DOWN:      return EL_SP_GRAVITY_PORT_RIGHT;
+
+    case EL_SP_GRAVITY_ON_PORT_LEFT:   return EL_SP_GRAVITY_ON_PORT_UP;
+    case EL_SP_GRAVITY_ON_PORT_RIGHT:  return EL_SP_GRAVITY_ON_PORT_DOWN;
+    case EL_SP_GRAVITY_ON_PORT_UP:     return EL_SP_GRAVITY_ON_PORT_LEFT;
+    case EL_SP_GRAVITY_ON_PORT_DOWN:   return EL_SP_GRAVITY_ON_PORT_RIGHT;
+
+    case EL_SP_GRAVITY_OFF_PORT_LEFT:  return EL_SP_GRAVITY_OFF_PORT_UP;
+    case EL_SP_GRAVITY_OFF_PORT_RIGHT: return EL_SP_GRAVITY_OFF_PORT_DOWN;
+    case EL_SP_GRAVITY_OFF_PORT_UP:    return EL_SP_GRAVITY_OFF_PORT_LEFT;
+    case EL_SP_GRAVITY_OFF_PORT_DOWN:  return EL_SP_GRAVITY_OFF_PORT_RIGHT;
+
+    case EL_SP_CHIP_LEFT:              return EL_SP_CHIP_TOP;
+    case EL_SP_CHIP_RIGHT:             return EL_SP_CHIP_BOTTOM;
+    case EL_SP_CHIP_TOP:               return EL_SP_CHIP_LEFT;
+    case EL_SP_CHIP_BOTTOM:            return EL_SP_CHIP_RIGHT;
+
+    case EL_TUBE_VERTICAL:             return EL_TUBE_HORIZONTAL;
+    case EL_TUBE_HORIZONTAL:           return EL_TUBE_VERTICAL;
+    case EL_TUBE_VERTICAL_LEFT:                return EL_TUBE_HORIZONTAL_UP;
+    case EL_TUBE_VERTICAL_RIGHT:       return EL_TUBE_HORIZONTAL_DOWN;
+    case EL_TUBE_HORIZONTAL_UP:                return EL_TUBE_VERTICAL_LEFT;
+    case EL_TUBE_HORIZONTAL_DOWN:      return EL_TUBE_VERTICAL_RIGHT;
+    case EL_TUBE_LEFT_DOWN:            return EL_TUBE_RIGHT_UP;
+    case EL_TUBE_RIGHT_UP:             return EL_TUBE_LEFT_DOWN;
+
+    case EL_DC_STEELWALL_1_LEFT:       return EL_DC_STEELWALL_1_TOP;
+    case EL_DC_STEELWALL_1_RIGHT:      return EL_DC_STEELWALL_1_BOTTOM;
+    case EL_DC_STEELWALL_1_TOP:                return EL_DC_STEELWALL_1_LEFT;
+    case EL_DC_STEELWALL_1_BOTTOM:     return EL_DC_STEELWALL_1_RIGHT;
+    case EL_DC_STEELWALL_1_HORIZONTAL: return EL_DC_STEELWALL_1_VERTICAL;
+    case EL_DC_STEELWALL_1_VERTICAL:   return EL_DC_STEELWALL_1_HORIZONTAL;
+    case EL_DC_STEELWALL_1_TOPRIGHT:   return EL_DC_STEELWALL_1_BOTTOMLEFT;
+    case EL_DC_STEELWALL_1_BOTTOMLEFT: return EL_DC_STEELWALL_1_TOPRIGHT;
+    case EL_DC_STEELWALL_1_TOPRIGHT_2: return EL_DC_STEELWALL_1_BOTTOMLEFT_2;
+    case EL_DC_STEELWALL_1_BOTTOMLEFT_2: return EL_DC_STEELWALL_1_TOPRIGHT_2;
+
+    case EL_DC_STEELWALL_2_LEFT:       return EL_DC_STEELWALL_2_TOP;
+    case EL_DC_STEELWALL_2_RIGHT:      return EL_DC_STEELWALL_2_BOTTOM;
+    case EL_DC_STEELWALL_2_TOP:                return EL_DC_STEELWALL_2_LEFT;
+    case EL_DC_STEELWALL_2_BOTTOM:     return EL_DC_STEELWALL_2_RIGHT;
+    case EL_DC_STEELWALL_2_HORIZONTAL: return EL_DC_STEELWALL_2_VERTICAL;
+    case EL_DC_STEELWALL_2_VERTICAL:   return EL_DC_STEELWALL_2_HORIZONTAL;
+
+    case EL_EXPANDABLE_WALL_HORIZONTAL:        return EL_EXPANDABLE_WALL_VERTICAL;
+    case EL_EXPANDABLE_WALL_VERTICAL:  return EL_EXPANDABLE_WALL_HORIZONTAL;
+
+    case EL_EXPANDABLE_STEELWALL_HORIZONTAL:   return EL_EXPANDABLE_STEELWALL_VERTICAL;
+    case EL_EXPANDABLE_STEELWALL_VERTICAL:     return EL_EXPANDABLE_STEELWALL_HORIZONTAL;
+  }
+
+  return element;
+}
+
+static int getFlippedTile(int element, int mode)
+{
+  if (IS_MM_ELEMENT(element))
+  {
+    // get MM game element
+    element = map_element_RND_to_MM(element);
+
+    // get flipped game element
+    element = (mode == CB_FLIP_BRUSH_X  ? getFlippedTileX_MM(element) :
+              mode == CB_FLIP_BRUSH_Y  ? getFlippedTileY_MM(element) :
+              mode == CB_FLIP_BRUSH_XY ? getFlippedTileXY_MM(element) :
+              element);
+
+    // get RND game element again
+    element = map_element_MM_to_RND(element);
+  }
+  else
+  {
+    // get flipped game element
+    element = (mode == CB_FLIP_BRUSH_X  ? getFlippedTileX(element) :
+              mode == CB_FLIP_BRUSH_Y  ? getFlippedTileY(element) :
+              mode == CB_FLIP_BRUSH_XY ? getFlippedTileXY(element) :
+              element);
+  }
+
+  return element;
+}
+
+static void SwapFlippedTiles(short *tile1, short *tile2, int mode)
+{
+  // flip tiles
+  short tile1_flipped = getFlippedTile(*tile1, mode);
+  short tile2_flipped = getFlippedTile(*tile2, mode);
+
+  // swap tiles
+  *tile1 = tile2_flipped;
+  *tile2 = tile1_flipped;
+}
+
 static void DrawBrushElement(int sx, int sy, int element, boolean change_level)
 {
   DrawLineElement(sx, sy, element, change_level);
@@ -12713,6 +13031,37 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 
     delete_old_brush = TRUE;
   }
+  else if (mode == CB_FLIP_BRUSH_X)
+  {
+    for (y = 0; y < brush_height; y++)
+      for (x = 0; x < (brush_width + 1) / 2; x++)
+       SwapFlippedTiles(&brush_buffer[x][y],
+                        &brush_buffer[brush_width - x - 1][y], mode);
+
+    CopyBrushExt(last_cursor_x, last_cursor_y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
+  }
+  else if (mode == CB_FLIP_BRUSH_Y)
+  {
+    for (y = 0; y < (brush_height + 1) / 2; y++)
+      for (x = 0; x < brush_width; x++)
+       SwapFlippedTiles(&brush_buffer[x][y],
+                        &brush_buffer[x][brush_height - y - 1], mode);
+
+    CopyBrushExt(last_cursor_x, last_cursor_y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
+  }
+  else if (mode == CB_FLIP_BRUSH_XY)
+  {
+    CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
+
+    for (y = 0; y < MAX(brush_width, brush_height); y++)
+      for (x = 0; x <= y; x++)
+       SwapFlippedTiles(&brush_buffer[x][y],
+                        &brush_buffer[y][x], mode);
+
+    swap_numbers(&brush_width, &brush_height);
+
+    CopyBrushExt(last_cursor_x, last_cursor_y, 0, 0, 0, CB_BRUSH_TO_CURSOR);
+  }
 
   if (mode == CB_UPDATE_BRUSH_POSITION)
   {
@@ -12747,6 +13096,22 @@ static void DeleteBrushFromCursor(void)
   CopyBrushExt(0, 0, 0, 0, 0, CB_DELETE_OLD_CURSOR);
 }
 
+static void FlipBrushX(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_X);
+}
+
+static void FlipBrushY(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_Y);
+}
+
+static void RotateBrush(void)
+{
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_XY);
+  CopyBrushExt(0, 0, 0, 0, 0, CB_FLIP_BRUSH_X);
+}
+
 void DumpBrush(void)
 {
   CopyBrushExt(0, 0, 0, 0, 0, CB_DUMP_BRUSH);
@@ -14687,6 +15052,16 @@ void HandleLevelEditorKeyInput(Key key)
       if (letter && letter == controlbutton_info[i].shortcut)
        if (!anyTextGadgetActive())
          ClickOnGadget(level_editor_gadget[i], button);
+
+  if (draw_with_brush)
+  {
+    if (letter == 'x')
+      FlipBrushX();
+    else if (letter == 'y')
+      FlipBrushY();
+    else if (letter == 'z')
+      RotateBrush();
+  }
 }
 
 static void HandleLevelEditorIdle_Properties(void)