X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=688a63b7945d8650c328f2582e849a07d26e2fd1;hb=fa9c72bb286c8e5e5095e666dbf85981ad3a8ea2;hp=c6b2632a6f90970a4af49d84e6caf8957a5ae98b;hpb=c9735f4510c07f163fc103d61ba4e0d2010c2032;p=rocksndiamonds.git

diff --git a/src/editor.c b/src/editor.c
index c6b2632a..688a63b7 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -1606,7 +1606,7 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
 
 static void CreateControlButtons()
 {
-  Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
+  Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int i;
@@ -1827,7 +1827,7 @@ static void CreateCounterButtons()
 
     for (j=0; j<2; j++)
     {
-      Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
+      Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
       struct GadgetInfo *gi;
       int id = (j == 0 ?
 		counterbutton_info[i].gadget_id_down :
@@ -2049,7 +2049,7 @@ static void CreateTextInputGadgets()
 
   for (i=0; i<ED_NUM_TEXTINPUT; i++)
   {
-    Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x, gd_y;
     struct GadgetInfo *gi;
     unsigned long event_mask;
@@ -2096,7 +2096,7 @@ static void CreateScrollbarGadgets()
   for (i=0; i<ED_NUM_SCROLLBARS; i++)
   {
     int id = scrollbar_info[i].gadget_id;
-    Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
+    Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
     int gd_x1, gd_x2, gd_y1, gd_y2;
     struct GadgetInfo *gi;
     int items_max, items_visible, item_position;
@@ -2161,7 +2161,7 @@ static void CreateScrollbarGadgets()
 
 static void CreateCheckbuttonGadgets()
 {
-  Bitmap *gd_bitmap = new_graphic_info[IMG_MENU_DOOR].bitmap;
+  Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
   struct GadgetInfo *gi;
   unsigned long event_mask;
   int gd_x1, gd_x2, gd_x3, gd_x4, gd_y;
@@ -2440,7 +2440,7 @@ void DrawLevelEd()
   }
 
   /* copy default editor door content to main double buffer */
-  BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto,
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
 	     DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
   /* draw mouse button brush elements */
@@ -2458,7 +2458,7 @@ void DrawLevelEd()
   DrawSpecialEditorDoor();
 
   /* draw new control window */
-  BlitBitmap(new_graphic_info[IMG_MENU_DOOR].bitmap, drawto,
+  BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
 	     DOOR_GFX_PAGEX8, 236, EXSIZE, EYSIZE, EX, EY);
 
   redraw_mask |= REDRAW_ALL;
@@ -2650,46 +2650,49 @@ static void PickDrawingElement(int button, int element)
 
 static void DrawDrawingWindow()
 {
+  SetMainBackgroundImage(IMG_UNDEFINED);
   ClearWindow();
-
-#if 1
-  ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
-  redraw_mask |= REDRAW_FROM_BACKBUFFER;
-#endif
-
   UnmapLevelEditorWindowGadgets();
+
   AdjustDrawingAreaGadgets();
   AdjustLevelScrollPosition();
   AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL);
   AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL);
+
   DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   MapMainDrawingArea();
 }
 
+static void DrawElementBorder(int dest_x, int dest_y, int width, int height)
+{
+  int border_graphic = IMG_SAND;
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+  int num_mini_tilex = width / MINI_TILEX + 1;
+  int num_mini_tiley = width / MINI_TILEY + 1;
+  int x, y;
+
+  getMiniGraphicSource(border_graphic, &src_bitmap, &src_x, &src_y);
+
+  for (y=0; y < num_mini_tiley; y++)
+    for (x=0; x < num_mini_tilex; x++)
+      BlitBitmap(src_bitmap, drawto, src_x, src_y, MINI_TILEX, MINI_TILEY,
+		 dest_x - MINI_TILEX / 2 + x * MINI_TILEX,
+		 dest_y - MINI_TILEY / 2 + y * MINI_TILEY);
+
+  ClearRectangle(drawto, dest_x - 1, dest_y - 1, width + 2, height + 2);
+}
+
 static void DrawRandomPlacementBackgroundArea()
 {
   int area_x = ED_AREA_RANDOM_BACKGROUND_XPOS / MINI_TILEX;
   int area_y = ED_AREA_RANDOM_BACKGROUND_YPOS / MINI_TILEY;
   int area_sx = SX + ED_AREA_RANDOM_BACKGROUND_XPOS;
   int area_sy = SY + ED_AREA_RANDOM_BACKGROUND_YPOS;
-  int x, y;
 
   ElementContent[0][0][0] = random_placement_background_element;
 
-  /* draw decorative border for the object */
-  for (y=0; y<2; y++)
-    for (x=0; x<2; x++)
-      DrawMiniElement(area_x + x, area_y + y, EL_SAND);
-
-  ClearRectangle(drawto,
-		 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
-		 MINI_TILEX + 2, MINI_TILEY + 2);
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
-	     area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
-
+  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY);
   DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
   MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND);
@@ -2707,6 +2710,7 @@ static void DrawLevelInfoWindow()
   int font_color = FC_GREEN;
   int i, x, y;
 
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR_SETTINGS_LEVEL);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
@@ -2794,29 +2798,15 @@ static void DrawAmoebaContentArea()
   int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
   int area_sy = SY + ED_AREA_ELEM_CONTENT_YPOS;
   int font_color = FC_GREEN;
-  int x, y;
 
   ElementContent[0][0][0] = level.amoeba_content;
 
-  /* draw decorative border for the object */
-  for (y=0; y<2; y++)
-    for (x=0; x<2; x++)
-      DrawMiniElement(area_x + x, area_y + y, EL_SAND);
-
-  ClearRectangle(drawto,
-		 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
-		 MINI_TILEX + 2, MINI_TILEY + 2);
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
-	     area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+  DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY);
+  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
   DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba",
 	   FS_SMALL, font_color);
 
-  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
-
   MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
 }
 
@@ -2849,28 +2839,12 @@ static void DrawElementContentAreas()
   MapCounterButtons(counter_id);
 
   /* delete content areas in case of reducing number of them */
-  ClearRectangle(backbuffer,
-		 SX, area_sy - MINI_TILEX,
-		 SXSIZE, 12 * MINI_TILEY);
+  DrawBackground(SX, area_sy - MINI_TILEX, SXSIZE, 12 * MINI_TILEY);
 
-  /* draw some decorative border for the objects */
   for (i=0; i<level.num_yam_contents; i++)
-  {
-    for (y=0; y<4; y++)
-      for (x=0; x<4; x++)
-	DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
-			EL_SAND);
-
-    ClearRectangle(drawto,
-		   area_sx + 5 * (i % 4) * MINI_TILEX + MINI_TILEX/2 - 1,
-		   area_sy + 6 * (i / 4) * MINI_TILEY + MINI_TILEY/2 - 1,
-		   3 * MINI_TILEX + 2, 3 * MINI_TILEY + 2);
-  }
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     area_sx, area_sy, (5 * 4 + 1) * MINI_TILEX, 11 * MINI_TILEY,
-	     area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
+    DrawElementBorder(area_sx + 5 * (i % 4) * MINI_TILEX,
+		      area_sy + 6 * (i / 4) * MINI_TILEY,
+		      3 * MINI_TILEX, 3 * MINI_TILEY);
 
   DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 0 * MINI_TILEY + 1,
 	   "Content", FS_SMALL, font_color);
@@ -2895,43 +2869,6 @@ static void DrawElementContentAreas()
     MapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
 }
 
-#if 0
-static void DrawPropertiesElement(int xstart, int ystart, int element)
-{
-  int x, y;
-
-  /* draw some decorative border for the object */
-  for (y=0; y<3; y++)
-    for (x=0; x<3; x++)
-      DrawMiniElement(xstart + x , ystart + y, EL_SAND);
-
-  ClearRectangle(drawto,
-		 SX + xstart * MINI_TILEX + MINI_TILEX/2 - 1,
-		 SY + ystart * MINI_TILEY + MINI_TILEY/2 - 1,
-		 TILEX + 2, TILEY + 2);
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     SX + xstart * MINI_TILEX,
-	     SY + ystart * MINI_TILEY,
-	     2 * TILEX, 2 * TILEY,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY/2);
-
-  DrawGraphicAnimation(xstart / 2, ystart / 2, el2img(element));
-
-  /* copy the whole stuff to the definitive location */
-  BlitBitmap(drawto, drawto,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY,
-	     2 * TILEX, 2 * TILEY,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY/2);
-
-  FrameCounter++;	/* increase animation frame counter */
-}
-#endif
-
 #define TEXT_COLLECTING		"Score for collecting"
 #define TEXT_SMASHING		"Score for smashing"
 #define TEXT_CRACKING		"Score for cracking"
@@ -3006,53 +2943,22 @@ static void DrawPropertiesWindow()
     { -1, NULL, NULL }
   };
 
+  SetMainBackgroundImage(IMG_BACKGROUND_EDITOR_SETTINGS_ELEMENT);
   ClearWindow();
   UnmapLevelEditorWindowGadgets();
 
   DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS_YPOS,
 	   "Element Settings", FS_BIG, FC_YELLOW);
 
-#if 1
-  /* draw some decorative border for the object */
-  for (y=0; y<3; y++)
-    for (x=0; x<3; x++)
-      DrawMiniElement(xstart + x , ystart + y, EL_SAND);
-
-  ClearRectangle(drawto,
-		 SX + xstart * MINI_TILEX + MINI_TILEX/2 - 1,
-		 SY + ystart * MINI_TILEY + MINI_TILEY/2 - 1,
-		 TILEX + 2, TILEY + 2);
-
-  /* copy border to the right location */
-  BlitBitmap(drawto, drawto,
-	     SX + xstart * MINI_TILEX,
-	     SY + ystart * MINI_TILEY,
-	     2 * TILEX, 2 * TILEY,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY/2);
-
-#if 0
-  DrawGraphic(xstart / 2, ystart / 2, el2img(properties_element), 0);
-#else
-  DrawGraphicAnimation(xstart / 2, ystart / 2, el2img(properties_element));
-#endif
-
-  /* copy the whole stuff to the definitive location */
-  BlitBitmap(drawto, drawto,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY,
-	     2 * TILEX, 2 * TILEY,
-	     SX + xstart * MINI_TILEX - MINI_TILEX/2,
-	     SY + ystart * MINI_TILEY - MINI_TILEY/2);
-
-  FrameCounter = 0;	/* restart animation frame counter */
-
-#else
+  DrawElementBorder(SX + xstart * MINI_TILEX,
+		    SY + ystart * MINI_TILEY + MINI_TILEY / 2,
+		    TILEX, TILEY);
+  DrawGraphicAnimationExt(drawto,
+			  SX + xstart * MINI_TILEX,
+			  SY + ystart * MINI_TILEY + MINI_TILEY / 2,
+			  el2img(properties_element), -1, NO_MASKING);
 
   FrameCounter = 0;	/* restart animation frame counter */
-  DrawPropertiesElement(xstart, ystart, properties_element);
-
-#endif
 
   DrawTextF((xstart + 3) * MINI_TILEX, (ystart + 1) * MINI_TILEY,
 	    font_color, getElementInfoText(properties_element));
@@ -4436,15 +4342,23 @@ void HandleLevelEditorIdle()
   if (!DelayReached(&action_delay, action_delay_value))
     return;
 
-  FY += MINI_TILEY / 2;
 #if 1
-  DrawGraphicAnimation(xpos, ypos, el2img(properties_element));
+
+  DrawGraphicAnimationExt(drawto,
+			  SX + xpos * TILEX,
+			  SY + ypos * TILEY + MINI_TILEY / 2,
+			  el2img(properties_element), -1, NO_MASKING);
+
 #else
-  DrawGraphicAnimation(xpos, ypos, el_dir_act2img(properties_element,
-						  MV_NO_MOVING,
-						  ...));
+  DrawGraphicAnimationExt(drawto,
+			  SX + xpos * TILEX,
+			  SY + ypos * TILEY + MINI_TILEY / 2,
+			  el_dir_act2img(properties_element,
+					 MV_NO_MOVING,
+					 ...), -1, NO_MASKING);
 #endif
-  FY -= MINI_TILEY / 2;
+
+  MarkTileDirty(xpos, ypos);
   MarkTileDirty(xpos, ypos + 1);
 
   FrameCounter++;	/* increase animation frame counter */
@@ -4452,9 +4366,7 @@ void HandleLevelEditorIdle()
 
 void ClearEditorGadgetInfoText()
 {
-  ClearRectangle(drawto,
-		 INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
-  redraw_mask |= REDRAW_FIELD;
+  DrawBackground(INFOTEXT_XPOS, INFOTEXT_YPOS, INFOTEXT_XSIZE, INFOTEXT_YSIZE);
 }
 
 void HandleEditorGadgetInfoText(void *ptr)