X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=c6d85e3139926a01dfb3510757639d7af277193a;hp=2bf5543c8314fa4f345ebc88a4a2968a2141e9cd;hb=7732b3bda99e3cafc7db8718f2cac1f507c978e8;hpb=150e2c478051926d16763c247f76291f81d248cb

diff --git a/src/editor.c b/src/editor.c
index 2bf5543c..c6d85e31 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++)
@@ -7146,7 +7148,10 @@ void CreateLevelEditorGadgets(void)
   right_gadget_border =
     checked_calloc(num_editor_gadgets * sizeof(int));
 
-  editor_el_empty = checked_calloc(ED_NUM_ELEMENTLIST_BUTTONS * sizeof(int));
+  // set number of empty (padding) element buttons to maximum number of buttons
+  num_editor_el_empty = ED_NUM_ELEMENTLIST_BUTTONS;
+
+  editor_el_empty = checked_calloc(num_editor_el_empty * sizeof(int));
   editor_el_empty_ptr = editor_el_empty;
 
   use_permanent_palette = !editor.palette.show_as_separate_screen;
@@ -8498,29 +8503,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();
@@ -8539,7 +8546,7 @@ void DrawLevelEd(void)
 
   FadeSoundsAndMusic();
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
@@ -12376,6 +12383,8 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
     case TEXT_SETCURSOR:
       DrawEditorElement(last_sx, last_sy, Feld[lx][ly]);
       DrawAreaBorder(sx, sy, sx, sy);
+      StartTextInput(SX + sx * ed_tilesize, SY + sy * ed_tilesize,
+		     ed_tilesize, ed_tilesize);
       last_sx = sx;
       last_sy = sy;
       break;
@@ -12420,6 +12429,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
     case TEXT_END:
       CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
       DrawEditorElement(sx, sy, Feld[lx][ly]);
+      StopTextInput();
       typing = FALSE;
       break;