X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Feditor.c;h=1c7edbea94e919afc5bb2a9af3908922a20d4c05;hp=8338bbb37973bb5fa8cb3456982e1484c53d1455;hb=8bf628c4f976b617d840a64a6e7c2edb5f1d7719;hpb=f0b6179ac5fd4ff548d4263488373408f92874e8

diff --git a/src/editor.c b/src/editor.c
index 8338bbb3..1c7edbea 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -8503,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();
@@ -8544,7 +8546,7 @@ void DrawLevelEd(void)
 
   FadeSoundsAndMusic();
 
-  if (CheckIfGlobalBorderOrPlayfieldViewportHasChanged())
+  if (CheckFadeAll())
     fade_mask = REDRAW_ALL;
 
   FadeOut(fade_mask);
@@ -9750,10 +9752,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;
+      }
     }
   }