X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=f7735c70b012d6d945adeef60a57266b63f955a9;hp=9a712934ac5cf3a9344bd61244273bdfe4ff5d83;hb=a7c06161253796a30a0237a7f5a044f459c8cf35;hpb=8027f83cb6288618be3892b268760f25ca252606

diff --git a/src/tools.c b/src/tools.c
index 9a712934..f7735c70 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -312,8 +312,9 @@ void BlitScreenToBitmap(Bitmap *target_bitmap)
 #if NEW_TILESIZE
   int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
   int dy = (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
-
-  int bx1, bx2, ffx, ffy;
+  int dx_var = dx * TILESIZE_VAR / TILESIZE;
+  int dy_var = dy * TILESIZE_VAR / TILESIZE;
+  int ffx, ffy;
 
   // fx += dx * TILESIZE_VAR / TILESIZE;
   // fy += dy * TILESIZE_VAR / TILESIZE;
@@ -322,28 +323,41 @@ void BlitScreenToBitmap(Bitmap *target_bitmap)
   fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
 #endif
 
-  /* !!! THIS WORKS !!! */
-
-  ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
+  ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
+  ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
 
   if (EVEN(SCR_FIELDX))
   {
-    if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + 2 * TILEX_VAR / 2)
-    {
-      fx = fx + dx * TILESIZE_VAR / TILESIZE - MIN(ffx, TILEX_VAR / 2) +
-	1 * TILEX_VAR;
-    }
+    if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR)
+      fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR;
     else
-    {
-      fx = fx - (dx <= 0 ? TILEX_VAR : 0) + 1 * TILEX_VAR;
-
-      printf("::: STOPPED\n");
-    }
+      fx += (dx_var > 0 ? TILEX_VAR : 0);
+  }
+  else
+  {
+    fx += dx_var;
+  }
 
-    printf("::: %d (%d, %d) [%d] [%d] => %d\n",
-	   ffx, SBX_Left * TILEX_VAR, SBX_Right * TILEX_VAR, dx, FX, fx);
+  if (EVEN(SCR_FIELDY))
+  {
+    if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR)
+      fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR;
+    else
+      fy += (dy_var > 0 ? TILEY_VAR : 0);
+  }
+  else
+  {
+    fy += dy_var;
   }
 
+#if 0
+  printf("::: (%d, %d) [(%d / %d, %d / %d)] => %d, %d\n",
+	 scroll_x, scroll_y,
+	 SBX_Left, SBX_Right,
+	 SBY_Upper, SBY_Lower,
+	 fx, fy);
+#endif
+
   if (border.draw_masked[GAME_MODE_PLAYING])
   {
     if (buffer != backbuffer)
@@ -381,12 +395,45 @@ void BackToFront()
   if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD)
     redraw_mask |= REDRAW_FIELD;
 
+#if 0
+  // never redraw single tiles, always redraw the whole field
+  // (redrawing single tiles up to a certain threshold was faster on old,
+  // now legacy graphics, but slows things down on modern graphics now)
+  // UPDATE: this is now globally defined by value of REDRAWTILES_THRESHOLD
+  if (redraw_mask & REDRAW_TILES)
+    redraw_mask |= REDRAW_FIELD;
+#endif
+
+#if 0
+  /* !!! TEST ONLY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
+  /* (force full redraw) */
+  if (game_status == GAME_MODE_PLAYING)
+    redraw_mask |= REDRAW_FIELD;
+#endif
+
   if (redraw_mask & REDRAW_FIELD)
     redraw_mask &= ~REDRAW_TILES;
 
   if (redraw_mask == REDRAW_NONE)
     return;
 
+#if 0
+  printf("::: ");
+  if (redraw_mask & REDRAW_ALL)
+    printf("[REDRAW_ALL]");
+  if (redraw_mask & REDRAW_FIELD)
+    printf("[REDRAW_FIELD]");
+  if (redraw_mask & REDRAW_TILES)
+    printf("[REDRAW_TILES]");
+  if (redraw_mask & REDRAW_DOOR_1)
+    printf("[REDRAW_DOOR_1]");
+  if (redraw_mask & REDRAW_DOOR_2)
+    printf("[REDRAW_DOOR_2]");
+  if (redraw_mask & REDRAW_FROM_BACKBUFFER)
+    printf("[REDRAW_FROM_BACKBUFFER]");
+  printf(" [%d]\n", FrameCounter);
+#endif
+
   if (redraw_mask & REDRAW_TILES &&
       game_status == GAME_MODE_PLAYING &&
       border.draw_masked[GAME_MODE_PLAYING])
@@ -458,172 +505,88 @@ void BackToFront()
     }
     else
     {
+#if 1
+      BlitScreenToBitmap(window);
+#else
       int fx = FX, fy = FY;
 
-      if (setup.soft_scrolling)
-      {
 #if NEW_TILESIZE
-	int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
-	int dy = (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
-
-	int bx1, bx2, ffx, ffy;
+      int dx = (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
+      int dy = (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
+      int dx_var = dx * TILESIZE_VAR / TILESIZE;
+      int dy_var = dy * TILESIZE_VAR / TILESIZE;
+      int ffx, ffy;
 
-	// fx += dx * TILESIZE_VAR / TILESIZE;
-	// fy += dy * TILESIZE_VAR / TILESIZE;
+      // fx += dx * TILESIZE_VAR / TILESIZE;
+      // fy += dy * TILESIZE_VAR / TILESIZE;
 #else
-	fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
-	fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
+      fx += (ScreenMovDir & (MV_LEFT | MV_RIGHT) ? ScreenGfxPos : 0);
+      fy += (ScreenMovDir & (MV_UP | MV_DOWN)    ? ScreenGfxPos : 0);
 #endif
 
-#if 1
-
-#if 0
-	bx1 = SBX_Left * TILEX_VAR  + TILEX_VAR / 2;
-	// bx1 = SBX_Left * TILEX_VAR;
-	bx2 = SBX_Right * TILEX_VAR - TILEX_VAR / 2;
-	ffx = scroll_x * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
-
-	if (ffx > bx1) // && ffx < bx2)
-	  fx += dx * TILESIZE_VAR / TILESIZE;
-
-	// fx += TILEX_VAR - (ffx - bx1) % TILEX_VAR;
+      /* !!! THIS WORKS !!! */
 
-	printf("::: %d (%d, %d) (%d)\n", ffx, bx1, bx2, dx);
+      printf("::: %d, %d\n", scroll_x, scroll_y);
 
-#if 0
-	if (ffx > SBX_Left * TILEX_VAR)
-	  fx -= MIN(ffx, TILEX_VAR / 2);
-	if (ffx > SBX_Left * TILEX_VAR && ffx < (SBX_Right + 1) * TILEX_VAR)
-	  fx -= MIN(ffx, TILEX_VAR / 2);
-#endif
-
-#else
-
-#if 0
-	ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
-
-	if (EVEN(SCR_FIELDX))
-	{
-	  if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2)
-	    fx = fx + dx * TILESIZE_VAR / TILESIZE - MIN(ffx, TILEX_VAR / 2);
-	  else
-	    fx = fx - (dx <= 0 ? TILEX_VAR : 0);
-
-	  printf("::: %d (%d, %d) [%d] [%d] => %d\n",
-		 ffx, SBX_Left * TILEX_VAR, SBX_Right * TILEX_VAR, dx, FX, fx);
-	}
-#else
-
-#if 0
-	ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
+      ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
+      ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
 
-	if (EVEN(SCR_FIELDX))
-	{
-	  if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + 0 * TILEX_VAR / 2)
-	  {
-	    fx = fx + dx * TILESIZE_VAR / TILESIZE - MIN(ffx, TILEX_VAR / 2) +
-	      1 * TILEX_VAR;
-	  }
-	  else
-	  {
-	    fx = fx - (dx <= 0 ? TILEX_VAR : 0) + 1 * TILEX_VAR;
-
-	    printf("::: STOPPED\n");
-	  }
-
-	  printf("::: %d (%d, %d) [%d] [%d] => %d\n",
-		 ffx, SBX_Left * TILEX_VAR, SBX_Right * TILEX_VAR, dx, FX, fx);
-	}
-#else
-	/* !!! THIS WORKS !!! */
-
-	ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
-
-	if (EVEN(SCR_FIELDX))
-	{
-	  if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + 2 * TILEX_VAR / 2)
-	  {
-	    fx = fx + dx * TILESIZE_VAR / TILESIZE - MIN(ffx, TILEX_VAR / 2) +
-	      1 * TILEX_VAR;
-	  }
-	  else
-	  {
-	    fx = fx - (dx <= 0 ? TILEX_VAR : 0) + 1 * TILEX_VAR;
-
-	    printf("::: STOPPED\n");
-	  }
-
-	  printf("::: %d (%d, %d) [%d] [%d] [%d, %d] => %d\n",
-		 ffx, SBX_Left * TILEX_VAR, SBX_Right * TILEX_VAR,
-		 dx, FX, ScreenMovDir, ScreenGfxPos, fx);
-	}
+      if (EVEN(SCR_FIELDX))
+      {
+	if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR)
+	  fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR;
 	else
-	{
-	  fx += dx;
-	}
+	  fx += (dx > 0 ? TILEX_VAR : 0);
+      }
+      else
+      {
+	fx += dx;
+      }
 
+      if (EVEN(SCR_FIELDY))
+      {
+	if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR)
+	  fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR;
+	else
+	  fy += (dy > 0 ? TILEY_VAR : 0);
+      }
+      else
+      {
 	fy += dy;
-#endif
-
-#endif
-
-#endif
-
-#if 0
-	printf("::: %d, %d [%d, %d] [%d, %d] [%d, %d] [%d] [%d, %d]\n",
-	       fx, fy, FX, FY, ScreenMovDir, ScreenGfxPos,
-	       scroll_x, scroll_y,
-	       ffx,
-	       SBX_Left, SBX_Right);
-#endif
-
-#endif
-
-#if 0
-#if NEW_TILESIZE
-	fx = fx * TILESIZE_VAR / TILESIZE;
-	fy = fy * TILESIZE_VAR / TILESIZE;
-#endif
-#endif
       }
 
-      if (setup.soft_scrolling ||
-	  ABS(ScreenMovPos) + ScrollStepSize == TILEX ||
-	  ABS(ScreenMovPos) == ScrollStepSize ||
-	  redraw_tiles > REDRAWTILES_THRESHOLD)
+      if (border.draw_masked[GAME_MODE_PLAYING])
       {
-	if (border.draw_masked[GAME_MODE_PLAYING])
-	{
-	  if (buffer != backbuffer)
-	  {
-	    /* copy playfield buffer to backbuffer to add masked border */
-	    BlitBitmap(buffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY);
-	    DrawMaskedBorder(REDRAW_FIELD);
-	  }
-
-	  BlitBitmap(backbuffer, window,
-		     REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
-		     REAL_SX, REAL_SY);
-	}
-	else
+	if (buffer != backbuffer)
 	{
-	  BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY);
+	  /* copy playfield buffer to backbuffer to add masked border */
+	  BlitBitmap(buffer, backbuffer, fx, fy, SXSIZE, SYSIZE, SX, SY);
+	  DrawMaskedBorder(REDRAW_FIELD);
 	}
 
+	BlitBitmap(backbuffer, window,
+		   REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE,
+		   REAL_SX, REAL_SY);
+      }
+      else
+      {
+	BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY);
+      }
+#endif
+
 #if 0
 #ifdef DEBUG
-	printf("redrawing all (ScreenGfxPos == %d) because %s\n",
-	       ScreenGfxPos,
-	       (setup.soft_scrolling ?
-		"setup.soft_scrolling" :
-		ABS(ScreenGfxPos) + ScrollStepSize == TILEX ?
-		"ABS(ScreenGfxPos) + ScrollStepSize == TILEX" :
-		ABS(ScreenGfxPos) == ScrollStepSize ?
-		"ABS(ScreenGfxPos) == ScrollStepSize" :
-		"redraw_tiles > REDRAWTILES_THRESHOLD"));
+      printf("redrawing all (ScreenGfxPos == %d) because %s\n",
+	     ScreenGfxPos,
+	     (setup.soft_scrolling ?
+	      "setup.soft_scrolling" :
+	      ABS(ScreenGfxPos) + ScrollStepSize == TILEX ?
+	      "ABS(ScreenGfxPos) + ScrollStepSize == TILEX" :
+	      ABS(ScreenGfxPos) == ScrollStepSize ?
+	      "ABS(ScreenGfxPos) == ScrollStepSize" :
+	      "redraw_tiles > REDRAWTILES_THRESHOLD"));
 #endif
 #endif
-      }
     }
 
     redraw_mask &= ~REDRAW_MAIN;
@@ -667,17 +630,22 @@ void BackToFront()
       int sy = SY; // + (EVEN(SCR_FIELDY) ? TILEY_VAR / 2 : 0);
 
       int dx = 0, dy = 0;
+      int dx_var = dx * TILESIZE_VAR / TILESIZE;
+      int dy_var = dy * TILESIZE_VAR / TILESIZE;
       int ffx, ffy;
       int fx = FX, fy = FY;
 
-      ffx = (scroll_x - SBX_Left) * TILEX_VAR + dx * TILESIZE_VAR / TILESIZE;
+      int scr_fieldx = SCR_FIELDX + (EVEN(SCR_FIELDX) ? 2 : 0);
+      int scr_fieldy = SCR_FIELDY + (EVEN(SCR_FIELDY) ? 2 : 0);
+
+      ffx = (scroll_x - SBX_Left)  * TILEX_VAR + dx_var;
+      ffy = (scroll_y - SBY_Upper) * TILEY_VAR + dy_var;
 
       if (EVEN(SCR_FIELDX))
       {
-	if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + 2 * TILEX_VAR / 2)
+	if (ffx < SBX_Right * TILEX_VAR + TILEX_VAR / 2 + TILEX_VAR)
 	{
-	  fx = fx + dx * TILESIZE_VAR / TILESIZE - MIN(ffx, TILEX_VAR / 2) +
-	    1 * TILEX_VAR;
+	  fx += dx_var - MIN(ffx, TILEX_VAR / 2) + TILEX_VAR;
 
 	  if (fx % TILEX_VAR)
 	    sx -= TILEX_VAR / 2;
@@ -686,12 +654,33 @@ void BackToFront()
 	}
 	else
 	{
-	  fx = fx - (dx <= 0 ? TILEX_VAR : 0) + 1 * TILEX_VAR;
+	  fx += (dx_var > 0 ? TILEX_VAR : 0);
+	}
+      }
+
+      if (EVEN(SCR_FIELDY))
+      {
+	if (ffy < SBY_Lower * TILEY_VAR + TILEY_VAR / 2 + TILEY_VAR)
+	{
+	  fy += dy_var - MIN(ffy, TILEY_VAR / 2) + TILEY_VAR;
+
+	  if (fy % TILEY_VAR)
+	    sy -= TILEY_VAR / 2;
+	  else
+	    sy -= TILEY_VAR;
+	}
+	else
+	{
+	  fy += (dy_var > 0 ? TILEY_VAR : 0);
 	}
       }
 
-      for (x = 0; x < SCR_FIELDX; x++)
-	for (y = 0 ; y < SCR_FIELDY; y++)
+#if 0
+      printf("::: %d, %d, %d, %d\n", sx, sy, SCR_FIELDX, SCR_FIELDY);
+#endif
+
+      for (x = 0; x < scr_fieldx; x++)
+	for (y = 0 ; y < scr_fieldy; y++)
 	  if (redraw[redraw_x1 + x][redraw_y1 + y])
 	    BlitBitmap(buffer, window,
 		       FX + x * TILEX_VAR, FY + y * TILEY_VAR,
@@ -1098,7 +1087,18 @@ void DrawBackground(int x, int y, int width, int height)
   ClearRectangleOnBackground(backbuffer, x, y, width, height);
 #endif
 
+#if 1
+  /* (this only works for the current arrangement of playfield and panels) */
+  if (x < gfx.dx)
+    redraw_mask |= REDRAW_FIELD;
+  else if (y < gfx.vy)
+    redraw_mask |= REDRAW_DOOR_1;
+  else
+    redraw_mask |= REDRAW_DOOR_2;
+#else
+  /* (this is just wrong (when drawing to one of the two door panel areas)) */
   redraw_mask |= REDRAW_FIELD;
+#endif
 }
 
 void DrawBackgroundForFont(int x, int y, int width, int height, int font_nr)
@@ -2515,7 +2515,7 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
   int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND);
   boolean ffwd_delay = (tape.playing && tape.fast_forward);
   boolean no_delay = (tape.warp_forward);
-  unsigned long anim_delay = 0;
+  unsigned int anim_delay = 0;
   int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay);
   int anim_delay_value = (no_delay ? 0 : frame_delay_value);
   int font_nr = FONT_ENVELOPE_1 + envelope_nr;
@@ -2541,7 +2541,11 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action)
 
     SetDrawtoField(DRAW_BUFFERED);
 
+#if 1
+    BlitScreenToBitmap(backbuffer);
+#else
     BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
+#endif
 
     SetDrawtoField(DRAW_BACKBUFFER);
 
@@ -2577,7 +2581,7 @@ void AnimateEnvelopeDoor(char *text, int anim_mode, int action)
   int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND);
   boolean ffwd_delay = (tape.playing && tape.fast_forward);
   boolean no_delay = (tape.warp_forward);
-  unsigned long anim_delay = 0;
+  unsigned int anim_delay = 0;
   int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay);
   int anim_delay_value = (no_delay ? 0 : frame_delay_value);
 #if 1
@@ -2671,7 +2675,11 @@ void AnimateEnvelopeDoor(char *text, int anim_mode, int action)
 #else
     SetDrawtoField(DRAW_BUFFERED);
 
+#if 1
+    BlitScreenToBitmap(backbuffer);
+#else
     BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY);
+#endif
 
     SetDrawtoField(DRAW_BACKBUFFER);
 #endif
@@ -3087,11 +3095,11 @@ static void DrawPreviewLevelLabelExt(int mode)
 
 void DrawPreviewLevel(boolean restart)
 {
-  static unsigned long scroll_delay = 0;
-  static unsigned long label_delay = 0;
+  static unsigned int scroll_delay = 0;
+  static unsigned int label_delay = 0;
   static int from_x, from_y, scroll_direction;
   static int label_state, label_counter;
-  unsigned long scroll_delay_value = preview.step_delay;
+  unsigned int scroll_delay_value = preview.step_delay;
   boolean show_level_border = (BorderElement != EL_EMPTY);
   int level_xsize = lev_fieldx + (show_level_border ? 2 : 0);
   int level_ysize = lev_fieldy + (show_level_border ? 2 : 0);
@@ -4172,6 +4180,9 @@ boolean Request(char *text, unsigned int req_state)
 	      break;
 
 	    case KSYM_Escape:
+#if defined(TARGET_SDL2)
+	    case KSYM_Back:
+#endif
 	      result = 0;
 	      break;
 
@@ -4345,8 +4356,8 @@ unsigned int MoveDoor(unsigned int door_state)
 {
   static int door1 = DOOR_OPEN_1;
   static int door2 = DOOR_CLOSE_2;
-  unsigned long door_delay = 0;
-  unsigned long door_delay_value;
+  unsigned int door_delay = 0;
+  unsigned int door_delay_value;
   int stepsize = 1;
 
   if (door_1.width < 0 || door_1.width > DXSIZE)
@@ -4656,6 +4667,102 @@ void UndrawSpecialEditorDoor()
 
 /* ---------- new tool button stuff ---------------------------------------- */
 
+#if 1
+
+static struct
+{
+  int graphic;
+  struct TextPosInfo *pos;
+  int gadget_id;
+  char *infotext;
+} toolbutton_info[NUM_TOOL_BUTTONS] =
+{
+  {
+    IMG_REQUEST_BUTTON_GFX_YES,		&request.button.yes,
+    TOOL_CTRL_ID_YES,			"yes"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_NO,		&request.button.no,
+    TOOL_CTRL_ID_NO,			"no"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_CONFIRM,	&request.button.confirm,
+    TOOL_CTRL_ID_CONFIRM,		"confirm"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_PLAYER_1,	&request.button.player_1,
+    TOOL_CTRL_ID_PLAYER_1,		"player 1"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_PLAYER_2,	&request.button.player_2,
+    TOOL_CTRL_ID_PLAYER_2,		"player 2"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_PLAYER_3,	&request.button.player_3,
+    TOOL_CTRL_ID_PLAYER_3,		"player 3"
+  },
+  {
+    IMG_REQUEST_BUTTON_GFX_PLAYER_4,	&request.button.player_4,
+    TOOL_CTRL_ID_PLAYER_4,		"player 4"
+  }
+};
+
+void CreateToolButtons()
+{
+  int i;
+
+  for (i = 0; i < NUM_TOOL_BUTTONS; i++)
+  {
+    struct GraphicInfo *gfx = &graphic_info[toolbutton_info[i].graphic];
+    struct TextPosInfo *pos = toolbutton_info[i].pos;
+    struct GadgetInfo *gi;
+    Bitmap *deco_bitmap = None;
+    int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
+    unsigned int event_mask = GD_EVENT_RELEASED;
+    int gd_x   = gfx->src_x;
+    int gd_y   = gfx->src_y;
+    int gd_xp  = gfx->src_x + gfx->pressed_xoffset;
+    int gd_yp  = gfx->src_y + gfx->pressed_yoffset;
+    int id = i;
+
+    if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
+    {
+      int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
+
+      getSizedGraphicSource(PLAYER_NR_GFX(IMG_PLAYER_1, player_nr), 0,
+			    pos->size, &deco_bitmap, &deco_x, &deco_y);
+      deco_xpos = (gfx->width  - pos->size) / 2;
+      deco_ypos = (gfx->height - pos->size) / 2;
+    }
+
+    gi = CreateGadget(GDI_CUSTOM_ID, id,
+		      GDI_INFO_TEXT, toolbutton_info[i].infotext,
+		      GDI_X, DX + pos->x,
+		      GDI_Y, DY + pos->y,
+		      GDI_WIDTH, gfx->width,
+		      GDI_HEIGHT, gfx->height,
+		      GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+		      GDI_STATE, GD_BUTTON_UNPRESSED,
+		      GDI_DESIGN_UNPRESSED, gfx->bitmap, gd_x, gd_y,
+		      GDI_DESIGN_PRESSED, gfx->bitmap, gd_xp, gd_yp,
+		      GDI_DECORATION_DESIGN, deco_bitmap, deco_x, deco_y,
+		      GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
+		      GDI_DECORATION_SIZE, pos->size, pos->size,
+		      GDI_DECORATION_SHIFTING, 1, 1,
+		      GDI_DIRECT_DRAW, FALSE,
+		      GDI_EVENT_MASK, event_mask,
+		      GDI_CALLBACK_ACTION, HandleToolButtons,
+		      GDI_END);
+
+    if (gi == NULL)
+      Error(ERR_EXIT, "cannot create gadget");
+
+    tool_gadget[id] = gi;
+  }
+}
+
+#else
+
 /* graphic position values for tool buttons */
 #define TOOL_BUTTON_YES_XPOS		2
 #define TOOL_BUTTON_YES_YPOS		250
@@ -4765,7 +4872,7 @@ void CreateToolButtons()
     Bitmap *deco_bitmap = None;
     int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
     struct GadgetInfo *gi;
-    unsigned long event_mask;
+    unsigned int event_mask;
     int gd_xoffset, gd_yoffset;
     int gd_x1, gd_x2, gd_y;
     int id = i;
@@ -4814,6 +4921,8 @@ void CreateToolButtons()
   }
 }
 
+#endif
+
 void FreeToolButtons()
 {
   int i;
@@ -7248,7 +7357,7 @@ int getGameFrameDelay_EM(int native_em_game_frame_delay)
   return game_frame_delay_value;
 }
 
-unsigned int InitRND(long seed)
+unsigned int InitRND(int seed)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_EM)
     return InitEngineRandom_EM(seed);
@@ -7281,6 +7390,7 @@ inline static int get_effective_element_EM(int tile, int frame_em)
 	return (frame_em > 5 ? EL_EMPTY : element);
 
 #if 0
+	/* !!! FIX !!! */
       case Ydiamond_stone:
 	//  if (!game.use_native_emc_graphics_engine)
 	return EL_ROCK;
@@ -8839,15 +8949,16 @@ void CheckSingleStepMode_EM(byte action[MAX_PLAYERS], int frame,
 			    boolean any_player_moving,
 			    boolean player_is_dropping)
 {
-  int i;
-
   if (tape.single_step && tape.recording && !tape.pausing)
   {
+#if 0
     boolean active_players = FALSE;
+    int i;
 
     for (i = 0; i < MAX_PLAYERS; i++)
       if (action[i] != JOY_NO_ACTION)
 	active_players = TRUE;
+#endif
 
     // if (frame == 0)
     if (frame == 0 && !player_is_dropping)
@@ -8985,11 +9096,37 @@ void ToggleFullscreenIfNeeded()
   boolean change_fullscreen_mode = (video.fullscreen_enabled &&
 				    !strEqual(setup.fullscreen_mode,
 					      video.fullscreen_mode_current));
+  boolean change_window_scaling_percent = (!video.fullscreen_enabled &&
+					   setup.window_scaling_percent !=
+					   video.window_scaling_percent);
 
-  if (!video.fullscreen_available)
+  if (change_window_scaling_percent && video.fullscreen_enabled)
     return;
 
-  if (change_fullscreen || change_fullscreen_mode)
+  if (!change_window_scaling_percent && !video.fullscreen_available)
+    return;
+
+#if defined(TARGET_SDL2)
+  if (change_window_scaling_percent)
+  {
+    SDLSetWindowScaling(setup.window_scaling_percent);
+
+    return;
+  }
+  else if (change_fullscreen)
+  {
+    SDLSetWindowFullscreen(setup.fullscreen);
+
+    /* set setup value according to successfully changed fullscreen mode */
+    setup.fullscreen = video.fullscreen_enabled;
+
+    return;
+  }
+#endif
+
+  if (change_fullscreen ||
+      change_fullscreen_mode ||
+      change_window_scaling_percent)
   {
     Bitmap *tmp_backbuffer = CreateBitmap(WIN_XSIZE, WIN_YSIZE, DEFAULT_DEPTH);
 
@@ -9002,9 +9139,16 @@ void ToggleFullscreenIfNeeded()
       video.fullscreen_enabled = FALSE;		/* force new fullscreen mode */
     }
 
+    if (change_window_scaling_percent)
+    {
+      /* keep window mode, but change window scaling */
+      video.fullscreen_enabled = TRUE;		/* force new window scaling */
+    }
+
     /* toggle fullscreen */
     ChangeVideoModeIfNeeded(setup.fullscreen);
 
+    /* set setup value according to successfully changed fullscreen mode */
     setup.fullscreen = video.fullscreen_enabled;
 
     /* restore backbuffer content from temporary backbuffer backup bitmap */