X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=3d9416e35acf0bfe6481d3b4562f67a6e5b37308;hb=cb8b58732432cc7f3163446dedd54c63126b23c3;hp=a10f0dd247ef6ae1ad3f9c5415a0e2e4bd3d3888;hpb=4d4b9cf009d4aefe9e167ac6b838c468513684ab;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index a10f0dd2..3d9416e3 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -242,7 +242,8 @@ void DrawMaskedBorder_ALL()
 void DrawMaskedBorder(int redraw_mask)
 {
   /* do not draw masked screen borders when displaying title screens */
-  if (effectiveGameStatus() == GAME_MODE_TITLE)
+  if (effectiveGameStatus() == GAME_MODE_TITLE ||
+      effectiveGameStatus() == GAME_MODE_MESSAGE)
     return;
 
   if (redraw_mask & REDRAW_ALL)
@@ -587,10 +588,16 @@ void FadeCrossSaveBackbuffer()
   BlitBitmap(backbuffer, bitmap_db_cross, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
 }
 
+void SetWindowBackgroundImageIfDefined(int graphic)
+{
+  if (graphic_info[graphic].bitmap)
+    SetWindowBackgroundBitmap(graphic_info[graphic].bitmap);
+}
+
 void SetMainBackgroundImageIfDefined(int graphic)
 {
   if (graphic_info[graphic].bitmap)
-    SetMainBackgroundImage(graphic);
+    SetMainBackgroundBitmap(graphic_info[graphic].bitmap);
 }
 
 void SetMainBackgroundImage(int graphic)
@@ -703,6 +710,39 @@ void SetBorderElement()
   }
 }
 
+void FloodFillLevel(int from_x, int from_y, int fill_element,
+		    short field[MAX_LEV_FIELDX][MAX_LEV_FIELDY],
+		    int max_fieldx, int max_fieldy)
+{
+  int i,x,y;
+  int old_element;
+  static int check[4][2] = { { -1, 0 }, { 0, -1 }, { 1, 0 }, { 0, 1 } };
+  static int safety = 0;
+
+  /* check if starting field still has the desired content */
+  if (field[from_x][from_y] == fill_element)
+    return;
+
+  safety++;
+
+  if (safety > max_fieldx * max_fieldy)
+    Error(ERR_EXIT, "Something went wrong in 'FloodFill()'. Please debug.");
+
+  old_element = field[from_x][from_y];
+  field[from_x][from_y] = fill_element;
+
+  for (i = 0; i < 4; i++)
+  {
+    x = from_x + check[i][0];
+    y = from_y + check[i][1];
+
+    if (IN_FIELD(x, y, max_fieldx, max_fieldy) && field[x][y] == old_element)
+      FloodFillLevel(x, y, fill_element, field, max_fieldx, max_fieldy);
+  }
+
+  safety--;
+}
+
 void SetRandomAnimationValue(int x, int y)
 {
   gfx.anim_random_frame = GfxRandom[x][y];
@@ -1370,13 +1410,17 @@ void DrawScreenField(int x, int y)
     boolean cut_mode = NO_CUTTING;
 
     if (element == EL_QUICKSAND_EMPTYING ||
+	element == EL_QUICKSAND_FAST_EMPTYING ||
 	element == EL_MAGIC_WALL_EMPTYING ||
 	element == EL_BD_MAGIC_WALL_EMPTYING ||
+	element == EL_DC_MAGIC_WALL_EMPTYING ||
 	element == EL_AMOEBA_DROPPING)
       cut_mode = CUT_ABOVE;
     else if (element == EL_QUICKSAND_FILLING ||
+	     element == EL_QUICKSAND_FAST_FILLING ||
 	     element == EL_MAGIC_WALL_FILLING ||
-	     element == EL_BD_MAGIC_WALL_FILLING)
+	     element == EL_BD_MAGIC_WALL_FILLING ||
+	     element == EL_DC_MAGIC_WALL_FILLING)
       cut_mode = CUT_BELOW;
 
     if (cut_mode == CUT_ABOVE)
@@ -1418,8 +1462,10 @@ void DrawScreenField(int x, int y)
     content_old = Store[oldx][oldy];
 
     if (element_old == EL_QUICKSAND_EMPTYING ||
+	element_old == EL_QUICKSAND_FAST_EMPTYING ||
 	element_old == EL_MAGIC_WALL_EMPTYING ||
 	element_old == EL_BD_MAGIC_WALL_EMPTYING ||
+	element_old == EL_DC_MAGIC_WALL_EMPTYING ||
 	element_old == EL_AMOEBA_DROPPING)
       cut_mode = CUT_ABOVE;
 
@@ -4444,19 +4490,19 @@ em_object_mapping_list[] =
   },
   {
     Xexit,				TRUE,	FALSE,
-    EL_EXIT_CLOSED,			-1, -1
+    EL_EM_EXIT_CLOSED,			-1, -1
   },
   {
     Xexit_1,				TRUE,	FALSE,
-    EL_EXIT_OPEN,			-1, -1
+    EL_EM_EXIT_OPEN,			-1, -1
   },
   {
     Xexit_2,				FALSE,	FALSE,
-    EL_EXIT_OPEN,			-1, -1
+    EL_EM_EXIT_OPEN,			-1, -1
   },
   {
     Xexit_3,				FALSE,	FALSE,
-    EL_EXIT_OPEN,			-1, -1
+    EL_EM_EXIT_OPEN,			-1, -1
   },
   {
     Xdynamite,				TRUE,	FALSE,
@@ -5365,10 +5411,14 @@ int get_next_element(int element)
   {
     case EL_QUICKSAND_FILLING:		return EL_QUICKSAND_FULL;
     case EL_QUICKSAND_EMPTYING:		return EL_QUICKSAND_EMPTY;
+    case EL_QUICKSAND_FAST_FILLING:	return EL_QUICKSAND_FAST_FULL;
+    case EL_QUICKSAND_FAST_EMPTYING:	return EL_QUICKSAND_FAST_EMPTY;
     case EL_MAGIC_WALL_FILLING:		return EL_MAGIC_WALL_FULL;
     case EL_MAGIC_WALL_EMPTYING:	return EL_MAGIC_WALL_ACTIVE;
     case EL_BD_MAGIC_WALL_FILLING:	return EL_BD_MAGIC_WALL_FULL;
     case EL_BD_MAGIC_WALL_EMPTYING:	return EL_BD_MAGIC_WALL_ACTIVE;
+    case EL_DC_MAGIC_WALL_FILLING:	return EL_DC_MAGIC_WALL_FULL;
+    case EL_DC_MAGIC_WALL_EMPTYING:	return EL_DC_MAGIC_WALL_ACTIVE;
     case EL_AMOEBA_DROPPING:		return EL_AMOEBA_WET;
 
     default:				return element;
@@ -6194,12 +6244,16 @@ void PlayMenuMusic()
 
 void PlaySoundActivating()
 {
+#if 0
   PlaySound(SND_MENU_ITEM_ACTIVATING);
+#endif
 }
 
 void PlaySoundSelecting()
 {
+#if 0
   PlaySound(SND_MENU_ITEM_SELECTING);
+#endif
 }
 
 void ToggleFullscreenIfNeeded()