X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=64e96e24164b6515b4c6ae7bcd3a52ead062fe1b;hb=f941ccddee3065d7531298e37ad4dcfcd892c1f8;hp=8570bd199ce47bf9083e7f0bb6d6688e415d1009;hpb=240269d614d12d0612cc0764589e6798378e2b8c;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index 8570bd19..64e96e24 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -11,6 +11,8 @@
 *  editor.c                                                *
 ***********************************************************/
 
+#include <math.h>
+
 #include "editor.h"
 #include "screens.h"
 #include "tools.h"
@@ -72,11 +74,30 @@
 #define ED_CTRL2_BUTTON_XSIZE		30
 #define ED_CTRL2_BUTTON_YSIZE		20
 #define ED_CTRL2_BUTTONS_XPOS		5
-#define ED_CTRL2_BUTTONS_YPOS		100
+#define ED_CTRL2_BUTTONS_YPOS		99
 #define ED_NUM_CTRL1_BUTTONS   (ED_CTRL1_BUTTONS_HORIZ * ED_CTRL1_BUTTONS_VERT)
 #define ED_NUM_CTRL2_BUTTONS   (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT)
 #define ED_NUM_CTRL_BUTTONS    (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
 
+/* values for the element list */
+#define ED_ELEMENTLIST_UP_XPOS		35
+#define ED_ELEMENTLIST_UP_YPOS		5
+#define ED_ELEMENTLIST_UP_ALT_YPOS	140
+#define ED_ELEMENTLIST_DOWN_XPOS	35
+#define ED_ELEMENTLIST_DOWN_YPOS	250
+#define ED_ELEMENTLIST_DOWN_ALT_YPOS	165
+#define ED_ELEMENTLIST_UPDOWN_XSIZE	30
+#define ED_ELEMENTLIST_UPDOWN_YSIZE	25
+#define ED_ELEMENTLIST_XPOS		6
+#define ED_ELEMENTLIST_YPOS		30
+#define ED_ELEMENTLIST_ALT_YPOS		190
+#define ED_ELEMENTLIST_XSIZE		22
+#define ED_ELEMENTLIST_YSIZE		22
+#define ED_ELEMENTLIST_BUTTONS_HORIZ	4
+#define ED_ELEMENTLIST_BUTTONS_VERT	10
+#define ED_NUM_ELEMENTLIST_BUTTONS	(ED_ELEMENTLIST_BUTTONS_HORIZ * \
+					 ED_ELEMENTLIST_BUTTONS_VERT)
+
 /* values for element properties window */
 #define ED_PROPERTIES_XPOS		(TILEX - MINI_TILEX/2)
 
@@ -135,14 +156,14 @@
 #define ED_CTRL_ID_SINGLE_ITEMS		0
 #define ED_CTRL_ID_CONNECTED_ITEMS	1
 #define ED_CTRL_ID_LINE			2
-#define ED_CTRL_ID_TEXT			3
+#define ED_CTRL_ID_ARC			3
 #define ED_CTRL_ID_RECTANGLE		4
 #define ED_CTRL_ID_FILLED_BOX		5
 #define ED_CTRL_ID_WRAP_UP		6
-#define ED_CTRL_ID_PROPERTIES		7
+#define ED_CTRL_ID_TEXT			7
 #define ED_CTRL_ID_FLOOD_FILL		8
 #define ED_CTRL_ID_WRAP_LEFT		9
-#define ED_CTRL_ID_UNUSED1		10
+#define ED_CTRL_ID_PROPERTIES		10
 #define ED_CTRL_ID_WRAP_RIGHT		11
 #define ED_CTRL_ID_RANDOM_PLACEMENT	12
 #define ED_CTRL_ID_GRAB_BRUSH		13
@@ -205,7 +226,15 @@
 #define ED_CTRL_ID_SCROLL_VERTICAL	62
 #define ED_CTRL_ID_SCROLL_HORIZONTAL	63
 
-#define ED_NUM_GADGETS			64
+/* gadgets for scrolling element list */
+#define ED_CTRL_ID_ELEMENTLIST_UP	64
+#define ED_CTRL_ID_ELEMENTLIST_DOWN	65
+
+/* gadgets for buttons in element list */
+#define ED_CTRL_ID_ELEMENTLIST_FIRST	66
+#define ED_CTRL_ID_ELEMENTLIST_LAST	105
+
+#define ED_NUM_GADGETS			106
 
 /* values for counter gadgets */
 #define ED_COUNTER_ID_ELEM_SCORE	0
@@ -222,7 +251,7 @@
 #define ED_TEXTINPUT_ID_LEVEL_AUTHOR	1
 
 #define ED_NUM_COUNTERBUTTONS		8
-#define ED_NUM_SCROLLBUTTONS		4
+#define ED_NUM_SCROLLBUTTONS		6
 #define ED_NUM_SCROLLBARS		2
 #define ED_NUM_TEXTINPUT		2
 
@@ -246,14 +275,14 @@ static struct
   { 's', "draw single items" },
   { 'd', "draw connected items" },
   { 'l', "draw lines" },
-  { 't', "enter text elements" },
+  { 'a', "draw arcs" },
   { 'r', "draw outline rectangles" },
   { 'R', "draw filled rectangles" },
   { '\0', "wrap (rotate) level up" },
-  { '?', "properties of drawing element" },
+  { 't', "enter text elements" },
   { 'f', "flood fill" },
   { '\0', "wrap (rotate) level left" },
-  { '\0', "" },
+  { '?', "properties of drawing element" },
   { '\0', "wrap (rotate) level right" },
   { '\0', "random element placement" },
   { 'b', "grab brush" },
@@ -385,23 +414,39 @@ static struct
 {
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 0 * ED_SCROLLBUTTON_YSIZE,
-    ED_SCROLL_UP_XPOS,      ED_SCROLL_UP_YPOS,      ED_CTRL_ID_SCROLL_UP,
+    ED_SCROLL_UP_XPOS,      ED_SCROLL_UP_YPOS,
+    ED_CTRL_ID_SCROLL_UP,
     "scroll level editing area up"
   },
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 1 * ED_SCROLLBUTTON_YSIZE,
-    ED_SCROLL_DOWN_XPOS,    ED_SCROLL_DOWN_YPOS,    ED_CTRL_ID_SCROLL_DOWN,
+    ED_SCROLL_DOWN_XPOS,    ED_SCROLL_DOWN_YPOS,
+    ED_CTRL_ID_SCROLL_DOWN,
     "scroll level editing area down"
   },
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 2 * ED_SCROLLBUTTON_YSIZE,
-    ED_SCROLL_LEFT_XPOS,    ED_SCROLL_LEFT_YPOS,    ED_CTRL_ID_SCROLL_LEFT,
+    ED_SCROLL_LEFT_XPOS,    ED_SCROLL_LEFT_YPOS,
+    ED_CTRL_ID_SCROLL_LEFT,
     "scroll level editing area left"
   },
   {
     ED_SCROLLBUTTON_XPOS,   ED_SCROLLBUTTON_YPOS + 3 * ED_SCROLLBUTTON_YSIZE,
-    ED_SCROLL_RIGHT_XPOS,   ED_SCROLL_RIGHT_YPOS,   ED_CTRL_ID_SCROLL_RIGHT,
+    ED_SCROLL_RIGHT_XPOS,   ED_SCROLL_RIGHT_YPOS,
+    ED_CTRL_ID_SCROLL_RIGHT,
     "scroll level editing area right"
+  },
+  {
+    ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_ALT_YPOS,
+    ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_YPOS,
+    ED_CTRL_ID_ELEMENTLIST_UP,
+    "scroll element list up"
+  },
+  {
+    ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_ALT_YPOS,
+    ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_YPOS,
+    ED_CTRL_ID_ELEMENTLIST_DOWN,
+    "scroll element list down"
   }
 };
 
@@ -412,7 +457,7 @@ static struct
   int width, height;
   int type;
   int gadget_id;
-  char *text;
+  char *infotext;
 } scrollbar_info[ED_NUM_SCROLLBARS] =
 {
   {
@@ -445,7 +490,6 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *);
 static void HandleTextInputGadgets(struct GadgetInfo *);
 
 static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
-static boolean level_editor_gadgets_created = FALSE;
 
 static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
 static int last_drawing_function = ED_CTRL_ID_SINGLE_ITEMS;
@@ -659,10 +703,10 @@ int editor_element[] =
   EL_MAUER_Y,
   EL_MAUER_XY,
 
+  EL_INVISIBLE_STEEL,
+  EL_UNSICHTBAR,
   EL_SPEED_PILL,
   EL_LEERRAUM,
-  EL_LEERRAUM,
-  EL_LEERRAUM,
 
   EL_CHAR_A + ('S' - 'A'),
   EL_CHAR_A + ('O' - 'A'),
@@ -873,14 +917,6 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
   BackToFront();
 }
 
-void InitLevelEditorGadgets()
-{
-  int i;
-
-  for (i=0; i<ED_NUM_GADGETS; i++)
-    level_editor_gadget[i] = NULL;
-}
-
 static void CreateControlButtons()
 {
   Pixmap gd_pixmap = pix[PIX_DOOR];
@@ -897,11 +933,12 @@ static void CreateControlButtons()
     int gd_x1, gd_x2, gd_y1, gd_y2;
     int button_type;
     int radio_button_nr;
-    boolean radio_button_pressed;
+    boolean checked;
 
     if (id == ED_CTRL_ID_SINGLE_ITEMS ||
 	id == ED_CTRL_ID_CONNECTED_ITEMS ||
 	id == ED_CTRL_ID_LINE ||
+	id == ED_CTRL_ID_ARC ||
 	id == ED_CTRL_ID_TEXT ||
 	id == ED_CTRL_ID_RECTANGLE ||
 	id == ED_CTRL_ID_FILLED_BOX ||
@@ -911,14 +948,14 @@ static void CreateControlButtons()
     {
       button_type = GD_TYPE_RADIO_BUTTON;
       radio_button_nr = 1;
-      radio_button_pressed = (id == drawing_function ? TRUE : FALSE);
+      checked = (id == drawing_function ? TRUE : FALSE);
       event_mask = GD_EVENT_PRESSED;
     }
     else
     {
       button_type = GD_TYPE_NORMAL_BUTTON;
       radio_button_nr = 0;
-      radio_button_pressed = FALSE;
+      checked = FALSE;
 
       if (id == ED_CTRL_ID_WRAP_LEFT ||
 	  id == ED_CTRL_ID_WRAP_RIGHT ||
@@ -964,7 +1001,7 @@ static void CreateControlButtons()
 		      GDI_TYPE, button_type,
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
 		      GDI_RADIO_NR, radio_button_nr,
-		      GDI_RADIO_PRESSED, radio_button_pressed,
+		      GDI_CHECKED, checked,
 		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
 		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y1,
 		      GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y2,
@@ -979,28 +1016,101 @@ static void CreateControlButtons()
     level_editor_gadget[id] = gi;
   }
 
-  /* create buttons for scrolling of drawing area */
+  /* create buttons for scrolling of drawing area and element list */
   for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
   {
     int id = scrollbutton_info[i].gadget_id;
-    int gd_x1, gd_x2, gd_y;
+    int x, y, width, height;
+    int gd_x1, gd_x2, gd_y1, gd_y2;
+
+    x = scrollbutton_info[i].x;
+    y = scrollbutton_info[i].y;
 
     event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
 
-    gd_y  = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
-    gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
-    gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+    if (id == ED_CTRL_ID_ELEMENTLIST_UP ||
+	id == ED_CTRL_ID_ELEMENTLIST_DOWN)
+    {
+      x += DX;
+      y += DY;
+      width = ED_ELEMENTLIST_UPDOWN_XSIZE;
+      height = ED_ELEMENTLIST_UPDOWN_YSIZE;
+      gd_x1 = DOOR_GFX_PAGEX6 + scrollbutton_info[i].xpos;
+      gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].y;
+      gd_x2 = gd_x1;
+      gd_y2 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+    }
+    else
+    {
+      x += SX;
+      y += SY;
+      width = ED_SCROLLBUTTON_XSIZE;
+      height = ED_SCROLLBUTTON_YSIZE;
+      gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
+      gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+      gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+      gd_y2 = gd_y1;
+   }
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
-		      GDI_X, SX + scrollbutton_info[i].x,
-		      GDI_Y, SY + scrollbutton_info[i].y,
-		      GDI_WIDTH, ED_SCROLLBUTTON_XSIZE,
-		      GDI_HEIGHT, ED_SCROLLBUTTON_YSIZE,
+		      GDI_X, x,
+		      GDI_Y, y,
+		      GDI_WIDTH, width,
+		      GDI_HEIGHT, height,
 		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
 		      GDI_STATE, GD_BUTTON_UNPRESSED,
-		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
-		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
+		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
+		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_ACTION, HandleControlButtons,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    level_editor_gadget[id] = gi;
+  }
+
+  /* create buttons for element list */
+  for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+  {
+    Pixmap deco_pixmap;
+    int deco_x, deco_y, deco_xpos, deco_ypos;
+    int gd_xoffset, gd_yoffset;
+    int gd_x, gd_y1, gd_y2;
+    int x = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
+    int y = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
+    int id = ED_CTRL_ID_ELEMENTLIST_FIRST + i;
+
+    event_mask = GD_EVENT_RELEASED;
+
+    gd_xoffset = ED_ELEMENTLIST_XPOS + x * ED_ELEMENTLIST_XSIZE;
+    gd_yoffset = ED_ELEMENTLIST_YPOS + y * ED_ELEMENTLIST_YSIZE;
+
+    gd_x = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
+    gd_y1 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
+    gd_y2 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_ALT_YPOS;
+
+    getMiniGraphicSource(el2gfx(editor_element[i]),
+			 &deco_pixmap, &deco_x, &deco_y);
+    deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
+    deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_INFO_TEXT, "choose element",
+		      GDI_X, DX + gd_xoffset,
+		      GDI_Y, DY + gd_yoffset,
+		      GDI_WIDTH, ED_ELEMENTLIST_XSIZE,
+		      GDI_HEIGHT, ED_ELEMENTLIST_YSIZE,
+		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+		      GDI_STATE, GD_BUTTON_UNPRESSED,
+		      GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y1,
+		      GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y2,
+		      GDI_DECORATION_DESIGN, deco_pixmap, deco_x, deco_y,
+		      GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
+		      GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
+		      GDI_DECORATION_SHIFTING, 1, 1,
 		      GDI_EVENT_MASK, event_mask,
 		      GDI_CALLBACK_ACTION, HandleControlButtons,
 		      GDI_END);
@@ -1248,7 +1358,7 @@ static void CreateScrollbarGadgets()
     gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
-		      GDI_INFO_TEXT, scrollbar_info[i].text,
+		      GDI_INFO_TEXT, scrollbar_info[i].infotext,
 		      GDI_X, SX + scrollbar_info[i].x,
 		      GDI_Y, SY + scrollbar_info[i].y,
 		      GDI_WIDTH, scrollbar_info[i].width,
@@ -1272,18 +1382,13 @@ static void CreateScrollbarGadgets()
   }
 }
 
-static void CreateLevelEditorGadgets()
+void CreateLevelEditorGadgets()
 {
-  if (level_editor_gadgets_created)
-    return;
-
   CreateControlButtons();
   CreateCounterButtons();
   CreateDrawingAreas();
   CreateTextInputGadgets();
   CreateScrollbarGadgets();
-
-  level_editor_gadgets_created = TRUE;
 }
 
 static void MapControlButtons()
@@ -1292,6 +1397,8 @@ static void MapControlButtons()
 
   for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
     MapGadget(level_editor_gadget[i]);
+  for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+    MapGadget(level_editor_gadget[ED_CTRL_ID_ELEMENTLIST_FIRST + i]);
 }
 
 static void MapCounterButtons(int id)
@@ -1333,8 +1440,9 @@ void UnmapLevelEditorWindowGadgets()
 {
   int i;
 
-  for (i=ED_NUM_CTRL_BUTTONS; i<ED_NUM_GADGETS; i++)
-    UnmapGadget(level_editor_gadget[i]);
+  for (i=0; i<ED_NUM_GADGETS; i++)
+    if (level_editor_gadget[i]->x < DX)
+      UnmapGadget(level_editor_gadget[i]);
 }
 
 void UnmapLevelEditorGadgets()
@@ -1458,10 +1566,7 @@ void DrawLevelEd()
 
   OpenDoor(DOOR_OPEN_1);
 
-  if (!level_editor_gadgets_created)
-    CreateLevelEditorGadgets();
-  else
-    strcpy(level_editor_gadget[ED_CTRL_ID_LEVEL_NAME]->text.value, level.name);
+  strcpy(level_editor_gadget[ED_CTRL_ID_LEVEL_NAME]->text.value, level.name);
 
   MapControlButtons();
 
@@ -1794,6 +1899,9 @@ void LevelEd(int mx, int my, int button)
   }
   else				/********** EDIT/CTRL-FENSTER **********/
   {
+
+
+#if 0
     static unsigned long choice_delay = 0;
     int choice = CheckElemButtons(mx,my,button);
     int elem_pos = choice-ED_BUTTON_ELEM;
@@ -1806,14 +1914,8 @@ void LevelEd(int mx, int my, int button)
       int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
       int i;
 
-#if 0
-      step = (button==1 ? MAX_ELEM_X : button==2 ? 5*MAX_ELEM_X :
-	      elements_in_list);
-      element_shift += (choice==ED_BUTTON_EUP ? -step : step);
-#else
       step = step * MAX_ELEM_X * (choice == ED_BUTTON_EUP ? -1 : +1);
       element_shift += step;
-#endif
 
       if (element_shift<0)
 	element_shift = 0;
@@ -1843,6 +1945,9 @@ void LevelEd(int mx, int my, int button)
 	  DrawPropertiesWindow();
       }
     }
+#endif
+
+
   
     if (edit_mode == ED_MODE_DRAWING)	/********** EDIT-FENSTER **********/
     {
@@ -2768,8 +2873,7 @@ static void DrawLine(int from_x, int from_y, int to_x, int to_y,
 
       for (x=0; x<=len_x; x++)
       {
-	int y = (int)(a * x + 0.5) * (to_y < from_y ? -1 : +1);
-
+	y = (int)(a * x + 0.5) * (to_y < from_y ? -1 : +1);
 	DrawLineElement(from_x + x, from_y + y, element, change_level);
       }
     }
@@ -2782,8 +2886,7 @@ static void DrawLine(int from_x, int from_y, int to_x, int to_y,
 
       for (y=0; y<=len_y; y++)
       {
-	int x = (int)(a * y + 0.5) * (to_x < from_x ? -1 : +1);
-
+	x = (int)(a * y + 0.5) * (to_x < from_x ? -1 : +1);
 	DrawLineElement(from_x + x, from_y + y, element, change_level);
       }
     }
@@ -2811,6 +2914,76 @@ static void DrawFilledBox(int from_x, int from_y, int to_x, int to_y,
     DrawLine(from_x, y, to_x, y, element, change_level);
 }
 
+static void DrawArcExt(int from_x, int from_y, int to_x2, int to_y2,
+		       int element, boolean change_level)
+{
+  int to_x = to_x2 - (to_x2 > from_x ? +1 : -1);
+  int to_y = to_y2 - (to_y2 > from_y ? +1 : -1);
+  int len_x = ABS(to_x - from_x);
+  int len_y = ABS(to_y - from_y);
+  int radius, x, y;
+
+  radius = (int)(sqrt((float)(len_x * len_x + len_y * len_y)) + 0.5);
+
+  /* not optimal (some points get drawn twice) but simple,
+     and fast enough for the few points we are drawing */
+
+  for (x=0; x<=radius; x++)
+  {
+    int sx, sy, lx, ly;
+
+    y = (int)(sqrt((float)(radius * radius - x * x)) + 0.5);
+
+    sx = from_x + x * (from_x < to_x2 ? +1 : -1);
+    sy = from_y + y * (from_y < to_y2 ? +1 : -1);
+    lx = sx + level_xpos;
+    ly = sy + level_ypos;
+
+    if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
+      DrawLineElement(sx, sy, element, change_level);
+  }
+
+  for (y=0; y<=radius; y++)
+  {
+    int sx, sy, lx, ly;
+
+    x = (int)(sqrt((float)(radius * radius - y * y)) + 0.5);
+
+    sx = from_x + x * (from_x < to_x2 ? +1 : -1);
+    sy = from_y + y * (from_y < to_y2 ? +1 : -1);
+    lx = sx + level_xpos;
+    ly = sy + level_ypos;
+
+    if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
+      DrawLineElement(sx, sy, element, change_level);
+  }
+}
+
+static void DrawArc(int from_x, int from_y, int to_x, int to_y,
+		    int element, boolean change_level)
+{
+  int to_x2 = to_x + (to_x < from_x ? -1 : +1);
+  int to_y2 = to_y + (to_y > from_y ? +1 : -1);
+
+  DrawArcExt(from_x, from_y, to_x2, to_y2, element, change_level);
+}
+
+#if 0
+static void DrawCircle(int from_x, int from_y, int to_x, int to_y,
+		       int element, boolean change_level)
+{
+  int to_x2 = to_x + (to_x < from_x ? -1 : +1);
+  int to_y2 = to_y + (to_y > from_y ? +1 : -1);
+  int mirror_to_x2 = from_x - (to_x2 - from_x);
+  int mirror_to_y2 = from_y - (to_y2 - from_y);
+
+  DrawArcExt(from_x, from_y, to_x2, to_y2, element, change_level);
+  DrawArcExt(from_x, from_y, mirror_to_x2, to_y2, element, change_level);
+  DrawArcExt(from_x, from_y, to_x2, mirror_to_y2, element, change_level);
+  DrawArcExt(from_x, from_y, mirror_to_x2, mirror_to_y2, element,change_level);
+}
+#endif
+
 static void DrawAreaBorder(int from_x, int from_y, int to_x, int to_y)
 {
   int from_sx, from_sy;
@@ -3400,6 +3573,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       break;
 
     case ED_CTRL_ID_LINE:
+    case ED_CTRL_ID_ARC:
     case ED_CTRL_ID_RECTANGLE:
     case ED_CTRL_ID_FILLED_BOX:
     case ED_CTRL_ID_GRAB_BRUSH:
@@ -3413,6 +3587,8 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 
 	if (drawing_function == ED_CTRL_ID_LINE)
 	  draw_func = DrawLine;
+	else if (drawing_function == ED_CTRL_ID_ARC)
+	  draw_func = DrawArc;
 	else if (drawing_function == ED_CTRL_ID_RECTANGLE)
 	  draw_func = DrawRectangle;
 	else if (drawing_function == ED_CTRL_ID_FILLED_BOX)
@@ -3621,7 +3797,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
   int new_element;
   int player_present = FALSE;
   int level_changed = FALSE;
-  int x, y;
+  int i, x, y;
 
   new_element = (button == 1 ? new_element1 :
 		 button == 2 ? new_element2 :
@@ -3737,6 +3913,29 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       DrawMiniLevel(level_xpos, level_ypos);
       break;
 
+    case ED_CTRL_ID_ELEMENTLIST_UP:
+    case ED_CTRL_ID_ELEMENTLIST_DOWN:
+      step *= (id == ED_CTRL_ID_ELEMENTLIST_UP ? -1 : +1);
+      element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+
+      if (element_shift < 0)
+	element_shift = 0;
+      if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
+	element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
+
+      for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
+      {
+	int gadget_id = ED_CTRL_ID_ELEMENTLIST_FIRST + i;
+	struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+	struct GadgetDesign *design = &gi->deco.design;
+
+	UnmapGadget(gi);
+	getMiniGraphicSource(el2gfx(editor_element[element_shift + i]),
+			     &design->pixmap, &design->x, &design->y);
+	MapGadget(gi);
+      }
+      break;
+
     case ED_CTRL_ID_WRAP_LEFT:
       WrapLevel(-step, 0);
       break;
@@ -3756,6 +3955,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
     case ED_CTRL_ID_SINGLE_ITEMS:
     case ED_CTRL_ID_CONNECTED_ITEMS:
     case ED_CTRL_ID_LINE:
+    case ED_CTRL_ID_ARC:
     case ED_CTRL_ID_TEXT:
     case ED_CTRL_ID_RECTANGLE:
     case ED_CTRL_ID_FILLED_BOX:
@@ -4112,6 +4312,9 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
       	  case ED_CTRL_ID_LINE:
 	    infotext = "Drawing line";
 	    break;
+      	  case ED_CTRL_ID_ARC:
+	    infotext = "Drawing arc";
+	    break;
       	  case ED_CTRL_ID_TEXT:
 	    infotext = "Setting text cursor";
 	    break;
@@ -4149,7 +4352,7 @@ static void HandleDrawingAreaInfo(struct GadgetInfo *gi)
     /* misuse this function to draw brush cursor, if needed */
     if (edit_mode == ED_MODE_DRAWING && draw_with_brush && !button_status)
     {
-      if (IN_ED_FIELD(sx,sy) && IN_LEV_FIELD(lx, ly))
+      if (IN_ED_FIELD(sx, sy) && IN_LEV_FIELD(lx, ly))
 	CopyBrushToCursor(sx, sy);
       else
 	DeleteBrushFromCursor();