X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=c8444b1158c22f1acf52c5c0e94814e46f956be2;hp=9396d5eff13053a7a27003c8b14be530745224c0;hb=a59ebe8eb3a68db0a2ffcb8ce5127c767737d5ad;hpb=b77c449c5eb0d244bd0367746ce45da07b89e38a

diff --git a/src/editor.c b/src/editor.c
index 9396d5ef..c8444b11 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -65,8 +65,10 @@
 #define ED_ELEMENTLIST_YPOS		(editor.palette.y)
 #define ED_ELEMENTLIST_XSIZE		(graphic_info[IMG_EDITOR_PALETTE_BUTTON].width)
 #define ED_ELEMENTLIST_YSIZE		(graphic_info[IMG_EDITOR_PALETTE_BUTTON].height)
-#define ED_ELEMENTLIST_BUTTONS_HORIZ	(editor.palette.cols)
-#define ED_ELEMENTLIST_BUTTONS_VERT	(editor.palette.rows)
+#define ED_ELEMENTLIST_COLS		MAX(1, editor.palette.cols)
+#define ED_ELEMENTLIST_ROWS		MAX(1, editor.palette.rows)
+#define ED_ELEMENTLIST_BUTTONS_HORIZ	(ED_ELEMENTLIST_COLS)
+#define ED_ELEMENTLIST_BUTTONS_VERT	(ED_ELEMENTLIST_ROWS)
 #define ED_NUM_ELEMENTLIST_BUTTONS	(ED_ELEMENTLIST_BUTTONS_HORIZ *	\
 					 ED_ELEMENTLIST_BUTTONS_VERT)
 
@@ -5758,7 +5760,7 @@ static void ReinitializeElementList(void)
       {
 	// required for correct padding of palette headline buttons
 	if (*editor_elements_info[i].headline_list_size > 0)
-	  num_editor_elements += editor.palette.cols;
+	  num_editor_elements += ED_ELEMENTLIST_COLS;
 
 	for (j = 0; j < *editor_elements_info[i].headline_list_size; j++)
 	{
@@ -5775,8 +5777,8 @@ static void ReinitializeElementList(void)
       // required for correct padding of palette element buttons
       int element_list_size = *editor_elements_info[i].element_list_size;
       int element_rows =
-	(element_list_size + editor.palette.cols - 1) / editor.palette.cols;
-      int element_buttons = editor.palette.cols * element_rows;
+	(element_list_size + ED_ELEMENTLIST_COLS - 1) / ED_ELEMENTLIST_COLS;
+      int element_buttons = ED_ELEMENTLIST_COLS * element_rows;
 
       num_editor_elements += element_buttons;
     }
@@ -5808,7 +5810,7 @@ static void ReinitializeElementList(void)
       {
 	// required for correct padding of palette headline buttons
 	int headline_size = (*editor_elements_info[i].headline_list_size > 0 ?
-			     editor.palette.cols : 0);
+			     ED_ELEMENTLIST_COLS : 0);
 
 	for (j = 0; j < headline_size; j++)
 	{
@@ -5830,8 +5832,8 @@ static void ReinitializeElementList(void)
       // required for correct padding of palette element buttons
       int element_list_size = *editor_elements_info[i].element_list_size;
       int element_rows =
-	(element_list_size + editor.palette.cols - 1) / editor.palette.cols;
-      int element_buttons = editor.palette.cols * element_rows;
+	(element_list_size + ED_ELEMENTLIST_COLS - 1) / ED_ELEMENTLIST_COLS;
+      int element_buttons = ED_ELEMENTLIST_COLS * element_rows;
 
       // copy all elements from element list
       for (j = 0; j < element_list_size; j++)
@@ -8400,6 +8402,9 @@ static void InitZoomLevelSettings(int zoom_tilesize)
     ed_tilesize = setup.auto_setup.editor_zoom_tilesize;
     ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
 
+    // make sure that tile size is always a power of 2
+    ed_tilesize = (1 << log_2(ed_tilesize));
+
     if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
     {
       ed_tilesize = DEFAULT_EDITOR_TILESIZE_MM;
@@ -8501,29 +8506,31 @@ static boolean useEditorDoorAnimation(void)
   return (door_1_viewport_unchanged && door_1_contains_toolbox);
 }
 
+static void DrawEditorDoorBackground(int graphic, int x, int y,
+				     int width, int height)
+{
+  struct GraphicInfo *g = &graphic_info[graphic];
+
+  if (g->bitmap != NULL)
+    BlitBitmap(g->bitmap, drawto, g->src_x, g->src_y,
+	       MIN(width, g->width), MIN(height, g->height), x, y);
+  else
+    ClearRectangle(drawto, x, y, width, height);
+}
+
 static void DrawEditorDoorContent(void)
 {
   // needed for gadgets drawn on background (like palette scrollbar)
   SetDoorBackgroundImage(IMG_UNDEFINED);
 
   // copy default editor door content to main double buffer
-  BlitBitmap(graphic_info[IMG_BACKGROUND_PALETTE].bitmap, drawto,
-	     graphic_info[IMG_BACKGROUND_PALETTE].src_x,
-	     graphic_info[IMG_BACKGROUND_PALETTE].src_y,
-	     MIN(DXSIZE, graphic_info[IMG_BACKGROUND_PALETTE].width),
-	     MIN(DYSIZE, graphic_info[IMG_BACKGROUND_PALETTE].height),
-	     DX, DY);
+  DrawEditorDoorBackground(IMG_BACKGROUND_PALETTE, DX, DY, DXSIZE, DYSIZE);
 
   // draw bigger door
   DrawSpecialEditorDoor();
 
   // draw new control window
-  BlitBitmap(graphic_info[IMG_BACKGROUND_TOOLBOX].bitmap, drawto,
-	     graphic_info[IMG_BACKGROUND_TOOLBOX].src_x,
-	     graphic_info[IMG_BACKGROUND_TOOLBOX].src_y,
-	     MIN(EXSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].width),
-	     MIN(EYSIZE, graphic_info[IMG_BACKGROUND_TOOLBOX].height),
-	     EX, EY);
+  DrawEditorDoorBackground(IMG_BACKGROUND_TOOLBOX, EX, EY, EXSIZE, EYSIZE);
 
   // draw all toolbox gadgets to editor doors
   MapControlButtons();
@@ -8542,7 +8549,7 @@ void DrawLevelEd(void)
 
   FadeSoundsAndMusic();
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
@@ -9748,10 +9755,43 @@ static void SetAutomaticNumberOfGemsNeeded(void)
     {
       int element = Feld[x][y];
 
-      if (IS_GEM(element) ||
-	  element == EL_MM_KETTLE ||
-	  element == EL_DF_CELL)
-	level.gems_needed++;
+      switch (element)
+      {
+	case EL_EMERALD:
+	case EL_EMERALD_YELLOW:
+	case EL_EMERALD_RED:
+	case EL_EMERALD_PURPLE:
+	case EL_BD_DIAMOND:
+	case EL_WALL_EMERALD:
+	case EL_WALL_EMERALD_YELLOW:
+	case EL_WALL_EMERALD_RED:
+	case EL_WALL_EMERALD_PURPLE:
+	case EL_WALL_BD_DIAMOND:
+	case EL_NUT:
+	case EL_SP_INFOTRON:
+	case EL_MM_KETTLE:
+	case EL_DF_CELL:
+	  level.gems_needed++;
+	  break;
+
+	case EL_DIAMOND:
+	case EL_WALL_DIAMOND:
+	  level.gems_needed += 3;
+	  break;
+
+	case EL_PEARL:
+	case EL_WALL_PEARL:
+	  level.gems_needed += 5;
+	  break;
+
+	case EL_CRYSTAL:
+	case EL_WALL_CRYSTAL:
+	  level.gems_needed += 8;
+	  break;
+
+	default:
+	  break;
+      }
     }
   }
 
@@ -10839,7 +10879,6 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
   };
   static int last_x = -1;
   static int last_y = -1;
-  int old_element = IntelliDrawBuffer[x][y];
 
   if (new_element == EL_UNDEFINED)
   {
@@ -10849,6 +10888,8 @@ static void SetElementIntelliDraw(int x, int y, int new_element,
     return;
   }
 
+  int old_element = IntelliDrawBuffer[x][y];
+
   if (IS_TUBE(new_element))
   {
     int last_element_new = EL_UNDEFINED;
@@ -11623,11 +11664,21 @@ static void ResetIntelliDraw(void)
 
 static boolean draw_mode_hires = FALSE;
 
+static boolean isHiresTileElement(int element)
+{
+  return (IS_MM_WALL(element)        || element == EL_EMPTY);
+}
+
+static boolean isHiresDrawElement(int element)
+{
+  return (IS_MM_WALL_EDITOR(element) || element == EL_EMPTY);
+}
+
 static void SetDrawModeHiRes(int element)
 {
   draw_mode_hires =
     (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
-     (IS_MM_WALL_EDITOR(element) || element == EL_EMPTY));
+     isHiresDrawElement(element));
 }
 
 static boolean getDrawModeHiRes(void)
@@ -11945,27 +11996,28 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
     char text[MAX_CB_TEXT_SIZE + 1] = "";
     int width  = (draw_with_brush ? brush_width  : lev_fieldx);
     int height = (draw_with_brush ? brush_height : lev_fieldy);
+    char *format = "%s%03d";
+
+    for (y = 0; y < height; y++)
+      for (x = 0; x < width; x++)
+	if ((draw_with_brush ? brush_buffer[x][y] : Feld[x][y]) > 999)
+	  format = "%s%04d";
 
     for (y = 0; y < height; y++)
     {
       for (x = 0; x < width; x++)
       {
 	int element = (draw_with_brush ? brush_buffer[x][y] : Feld[x][y]);
-	int element_mapped = element;
 	char *prefix = (mode == CB_DUMP_BRUSH ||
 			mode == CB_BRUSH_TO_CLIPBOARD ? "`" : "¸");
 
-	if (IS_CUSTOM_ELEMENT(element))
-	  element_mapped = EL_CUSTOM_START;
-	else if (IS_GROUP_ELEMENT(element))
-	  element_mapped = EL_GROUP_START;
-	else if (element >= NUM_FILE_ELEMENTS)
-	  element_mapped = EL_UNKNOWN;
+	if (element >= NUM_FILE_ELEMENTS)
+	  element = EL_UNKNOWN;
 
 	// copy brush to level sketch text buffer for the R'n'D forum:
-	// - large tiles: `xxx (0x60 ASCII)
-	// - small tiles: ¸xxx (0xb8 ISO-8859-1, 0xc2b8 UTF-8)
-	snprintf(part, MAX_CB_PART_SIZE + 1, "%s%03d", prefix, element_mapped);
+	// - large tiles: `xxx or `xxxx (0x60 ASCII)
+	// - small tiles: ¸xxx or ¸xxxx (0xb8 ISO-8859-1, 0xc2b8 UTF-8)
+	snprintf(part, MAX_CB_PART_SIZE + 1, format, prefix, element);
 	strcat(text, part);
       }
 
@@ -12012,11 +12064,13 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 
     char *clipboard_text = SDL_GetClipboardText();
     char *ptr = clipboard_text;
+    boolean allow_new_row = FALSE;
     boolean stop = FALSE;
 
     while (*ptr && !stop)
     {
       boolean prefix_found = FALSE;
+      boolean start_new_row = FALSE;
 
       // level sketch element number prefixes (may be multi-byte characters)
       char *prefix_list[] = { "`", "¸" };
@@ -12045,19 +12099,10 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 	}
       }
 
-      // continue with next character if prefix not found
-      if (!prefix_found)
-      {
-	ptr++;		// !!! FIX THIS for real UTF-8 handling !!!
-
-	continue;
-      }
-
-      // continue with next character if prefix not found
-      if (strlen(ptr) < 3)
-	break;
-
-      if (ptr[0] >= '0' && ptr[0] <= '9' &&
+      // check if prefix found and followed by (at least) three digits
+      if (prefix_found &&
+	  strlen(ptr) >= 3 &&
+	  ptr[0] >= '0' && ptr[0] <= '9' &&
 	  ptr[1] >= '0' && ptr[1] <= '9' &&
 	  ptr[2] >= '0' && ptr[2] <= '9')
       {
@@ -12067,6 +12112,13 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 
 	ptr += 3;
 
+	// level sketch element number might consist of four digits
+	if (ptr[0] >= '0' && ptr[0] <= '9')
+	{
+	  element = element * 10 + (ptr[0] - '0');
+	  ptr++;
+	}
+
 	if (element >= NUM_FILE_ELEMENTS)
 	  element = EL_UNKNOWN;
 
@@ -12077,14 +12129,28 @@ static void CopyBrushExt(int from_x, int from_y, int to_x, int to_y,
 
 	x++;
 
-	if (x >= MAX_LEV_FIELDX || *ptr == '\n')
-	{
-	  x = 0;
-	  y++;
+	if (x >= MAX_LEV_FIELDX)
+	  start_new_row = TRUE;
 
-	  if (y >= MAX_LEV_FIELDY)
-	    stop = TRUE;
-	}
+	allow_new_row = TRUE;
+      }
+      else
+      {
+	if ((*ptr == '\n' || *ptr == '\r') && allow_new_row)
+	  start_new_row = TRUE;
+
+	ptr++;		// !!! FIX THIS for real UTF-8 handling !!!
+      }
+
+      if (start_new_row)
+      {
+	x = 0;
+	y++;
+
+	if (y >= MAX_LEV_FIELDY)
+	  stop = TRUE;
+
+	allow_new_row = FALSE;
       }
     }
 
@@ -12289,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);
@@ -12668,9 +12744,13 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
   }
   else if (!button_press_event)
   {
+    int old_element = (IN_LEV_FIELD(lx, ly) ? Feld[lx][ly] : EL_UNDEFINED);
+    boolean hires_drawing = (level.game_engine_type == GAME_ENGINE_TYPE_MM &&
+			     isHiresTileElement(old_element) &&
+			     isHiresDrawElement(new_element));
+
     // prevent handling events for every pixel position when moving mouse
-    if ((sx == last_sx && sy == last_sy &&
-	 !IS_MM_WALL_EDITOR(new_element) && new_element != EL_EMPTY) ||
+    if ((sx == last_sx && sy == last_sy && !hires_drawing) ||
 	(sx2 == last_sx2 && sy2 == last_sy2))
       return;
   }
@@ -12740,13 +12820,37 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
 	{
 	  SetDrawModeHiRes(new_element);
 
-	  if (new_element == EL_PLAYER_1)
+	  if (ELEM_IS_PLAYER(new_element))
 	  {
 	    // remove player at old position
 	    for (y = 0; y < lev_fieldy; y++)
+	    {
 	      for (x = 0; x < lev_fieldx; x++)
-		if (Feld[x][y] == EL_PLAYER_1)
-		  SetElement(x, y, EL_EMPTY);
+	      {
+		int old_element = Feld[x][y];
+
+		if (ELEM_IS_PLAYER(old_element))
+		{
+		  int replaced_with_element =
+		    (old_element == EL_SOKOBAN_FIELD_PLAYER &&
+		     new_element == EL_PLAYER_1 ? EL_SOKOBAN_FIELD_EMPTY :
+
+		     old_element == EL_SOKOBAN_FIELD_PLAYER &&
+		     new_element == old_element ? EL_SOKOBAN_FIELD_EMPTY :
+
+		     new_element == EL_SOKOBAN_FIELD_PLAYER &&
+		     old_element == EL_PLAYER_1 ? EL_EMPTY :
+
+		     new_element >= EL_PLAYER_1 &&
+		     new_element <= EL_PLAYER_4 &&
+		     new_element == old_element ? EL_EMPTY :
+
+		     old_element);
+
+		  SetElement(x, y, replaced_with_element);
+		}
+	      }
+	    }
 	  }
 
 	  SetElementButton(lx, ly, dx, dy, new_element, button);
@@ -13688,6 +13792,10 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 		     button == 2 ? ed_tilesize_default :
 		     button == 3 ? ed_tilesize / 2 : ed_tilesize);
 
+      // when using touch device, cycle through all zoom tilesizes
+      if (runtime.uses_touch_device && ed_tilesize > TILESIZE)
+	ed_tilesize = MICRO_TILESIZE;
+
       // limit zoom level by upper and lower bound
       ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE);
 
@@ -13722,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)
@@ -13973,7 +14083,6 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 void HandleLevelEditorKeyInput(Key key)
 {
   char letter = getCharFromKey(key);
-  int button = MB_LEFTBUTTON;
 
   if (drawing_function == GADGET_ID_TEXT &&
       DrawLevelText(0, 0, 0, TEXT_QUERY_TYPING) == TRUE)
@@ -13986,150 +14095,141 @@ void HandleLevelEditorKeyInput(Key key)
       DrawLevelText(0, 0, 0, TEXT_NEWLINE);
     else if (key == KSYM_Escape)
       DrawLevelText(0, 0, 0, TEXT_END);
+
+    return;
   }
-  else if (button_status == MB_RELEASED)
-  {
-    int id = GADGET_ID_NONE;
-    int new_element_shift = element_shift;
-    int step = ED_ELEMENTLIST_BUTTONS_VERT - 1;
-    int i;
 
-    switch (key)
-    {
-      case KSYM_Left:
-	id = GADGET_ID_SCROLL_LEFT;
-	break;
-      case KSYM_Right:
-	id = GADGET_ID_SCROLL_RIGHT;
-	break;
-      case KSYM_Up:
-	id = GADGET_ID_SCROLL_UP;
-	break;
-      case KSYM_Down:
-	id = GADGET_ID_SCROLL_DOWN;
-	break;
+  int id = GADGET_ID_NONE;
+  int new_element_shift = element_shift;
+  int step = ED_ELEMENTLIST_BUTTONS_VERT - 1;
+  int button = MB_LEFTBUTTON;
+  int i;
 
-      case KSYM_Page_Up:
-      case KSYM_Page_Down:
-	step *= (key == KSYM_Page_Up ? -1 : +1);
-        element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+  switch (key)
+  {
+    case KSYM_Left:
+      id = GADGET_ID_SCROLL_LEFT;
+      break;
+    case KSYM_Right:
+      id = GADGET_ID_SCROLL_RIGHT;
+      break;
+    case KSYM_Up:
+      id = GADGET_ID_SCROLL_UP;
+      break;
+    case KSYM_Down:
+      id = GADGET_ID_SCROLL_DOWN;
+      break;
 
-        if (element_shift < 0)
-          element_shift = 0;
-        if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
-          element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
+    case KSYM_Page_Up:
+    case KSYM_Page_Down:
+      step *= (key == KSYM_Page_Up ? -1 : +1);
+      element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
 
-        ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
-                     GDI_SCROLLBAR_ITEM_POSITION,
-                     element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+      if (element_shift < 0)
+	element_shift = 0;
+      if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+	element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
 
-	ModifyEditorElementList();
+      ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+		   GDI_SCROLLBAR_ITEM_POSITION,
+		   element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
 
-	break;
+      ModifyEditorElementList();
 
-      case KSYM_Home:
-      case KSYM_End:
-	element_shift = (key == KSYM_Home ? 0 :
-			 num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS);
+      break;
 
-	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
-		     GDI_SCROLLBAR_ITEM_POSITION,
-		     element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+    case KSYM_Home:
+    case KSYM_End:
+      element_shift = (key == KSYM_Home ? 0 :
+		       num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS);
 
-	ModifyEditorElementList();
+      ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+		   GDI_SCROLLBAR_ITEM_POSITION,
+		   element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
 
-	break;
+      ModifyEditorElementList();
 
-      case KSYM_Insert:
-      case KSYM_Delete:
+      break;
 
-	// this is needed to prevent interference with running "True X-Mouse"
-	if (GetKeyModStateFromEvents() & KMOD_Control)
-	  break;
+    case KSYM_Insert:
+    case KSYM_Delete:
 
-	// check for last or next editor cascade block in element list
-	for (i = 0; i < num_editor_elements; i++)
-	{
-	  if ((key == KSYM_Insert && i == element_shift) ||
-	      (key == KSYM_Delete && new_element_shift > element_shift))
-	    break;
+      // this is needed to prevent interference with running "True X-Mouse"
+      if (GetKeyModStateFromEvents() & KMOD_Control)
+	break;
 
-	  // jump to next cascade block (or to start of element list)
-	  if (i == 0 || IS_EDITOR_CASCADE(editor_elements[i]))
-	    new_element_shift = i;
-	}
+      // check for last or next editor cascade block in element list
+      for (i = 0; i < num_editor_elements; i++)
+      {
+	if ((key == KSYM_Insert && i == element_shift) ||
+	    (key == KSYM_Delete && new_element_shift > element_shift))
+	  break;
 
-	if (i < num_editor_elements)
-	  element_shift = new_element_shift;
+	// jump to next cascade block (or to start of element list)
+	if (i == 0 || IS_EDITOR_CASCADE(editor_elements[i]))
+	  new_element_shift = i;
+      }
 
-	if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
-	  element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
+      if (i < num_editor_elements)
+	element_shift = new_element_shift;
 
-	ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
-		     GDI_SCROLLBAR_ITEM_POSITION,
-		     element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+      if (element_shift > num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS)
+	element_shift = num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS;
 
-	ModifyEditorElementList();
+      ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+		   GDI_SCROLLBAR_ITEM_POSITION,
+		   element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
 
-	break;
+      ModifyEditorElementList();
 
-      case KSYM_Escape:
-        if (edit_mode == ED_MODE_DRAWING)
-	{
-	  RequestExitLevelEditor(setup.ask_on_escape_editor, TRUE);
-	}
-        else if (edit_mode == ED_MODE_INFO)
-	{
-	  HandleControlButtons(level_editor_gadget[GADGET_ID_INFO]);
-	}
-        else if (edit_mode == ED_MODE_PROPERTIES)
-	{
-	  HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
-	}
-        else if (edit_mode == ED_MODE_PALETTE)
-	{
-	  HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
-	}
-	else		// should never happen
-	{
-	  ChangeEditModeWindow(ED_MODE_DRAWING);
-	}
+      break;
 
-        break;
+    case KSYM_Escape:
+      if (edit_mode == ED_MODE_DRAWING)
+	RequestExitLevelEditor(setup.ask_on_escape_editor, TRUE);
+      else if (edit_mode == ED_MODE_INFO)
+	HandleControlButtons(level_editor_gadget[GADGET_ID_INFO]);
+      else if (edit_mode == ED_MODE_PROPERTIES)
+	HandleControlButtons(level_editor_gadget[GADGET_ID_PROPERTIES]);
+      else if (edit_mode == ED_MODE_PALETTE)
+	HandleControlButtons(level_editor_gadget[GADGET_ID_PALETTE]);
+      else		// should never happen
+	ChangeEditModeWindow(ED_MODE_DRAWING);
 
-      default:
-	break;
-    }
+      break;
 
-    if (id != GADGET_ID_NONE)
-      ClickOnGadget(level_editor_gadget[id], button);
-    else if (letter == '1' || letter == '?')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_LEFT], button);
-    else if (letter == '2')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_MIDDLE], button);
-    else if (letter == '3')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_RIGHT], button);
-    else if (letter == '.')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
-    else if (letter == 'U')
-      ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
-    else if (letter == '-' || key == KSYM_KP_Subtract)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
-    else if (letter == '0' || key == KSYM_KP_0)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
-    else if (letter == '+' || key == KSYM_KP_Add ||
-	     letter == '=')	// ("Shift-=" is "+" on US keyboards)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
-    else if (key == KSYM_Return ||
-	     key == KSYM_space ||
-	     key == setup.shortcut.toggle_pause)
-      ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
-    else
-      for (i = 0; i < ED_NUM_CTRL_BUTTONS; i++)
-	if (letter && letter == controlbutton_info[i].shortcut)
-	  if (!anyTextGadgetActive())
-	    ClickOnGadget(level_editor_gadget[i], button);
+    default:
+      break;
   }
+
+  if (id != GADGET_ID_NONE)
+    ClickOnGadget(level_editor_gadget[id], button);
+  else if (letter == '1' || letter == '?')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_LEFT], button);
+  else if (letter == '2')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_MIDDLE], button);
+  else if (letter == '3')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ELEMENT_RIGHT], button);
+  else if (letter == '.')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
+  else if (letter == 'U')
+    ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
+  else if (letter == '-' || key == KSYM_KP_Subtract)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 3);
+  else if (letter == '0' || key == KSYM_KP_0)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
+  else if (letter == '+' || key == KSYM_KP_Add ||
+	   letter == '=')	// ("Shift-=" is "+" on US keyboards)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 1);
+  else if (key == KSYM_Return ||
+	   key == KSYM_space ||
+	   key == setup.shortcut.toggle_pause)
+    ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
+  else
+    for (i = 0; i < ED_NUM_CTRL_BUTTONS; i++)
+      if (letter && letter == controlbutton_info[i].shortcut)
+	if (!anyTextGadgetActive())
+	  ClickOnGadget(level_editor_gadget[i], button);
 }
 
 void HandleLevelEditorIdle(void)