X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=1c7edbea94e919afc5bb2a9af3908922a20d4c05;hb=34df5c161045d8dddfd1c24d7fb1cfa29e0a9746;hp=8c2e2ee6c803898b878ec3ce78be2bfff9ea510b;hpb=b6b5161dc056ea9b3b03aa9899487ba343f8feb6;p=rocksndiamonds.git

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