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

diff --git a/src/editor.c b/src/editor.c
index 8338bbb3..093b2290 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;
+      }
     }
   }
 
@@ -10841,7 +10876,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)
   {
@@ -10851,6 +10885,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;
@@ -11625,11 +11661,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)
@@ -12670,9 +12716,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;
   }
@@ -12742,13 +12792,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);