X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=e321f18c513a81dc3008e0e0cc87ed5581a285b4;hb=7b34743564e27c65b4d9c1ef55c3b12f6cf8a94a;hp=f2cffa56ba65aad73edd527e338b5a2b08eff30e;hpb=3df902ffd036b993f232ff9ff40a8435a838bd1f;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index f2cffa56..e321f18c 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -1728,7 +1728,7 @@ void DrawGraphicThruMask(int x, int y, int graphic, int frame)
 #if DEBUG
   if (!IN_SCR_FIELD(x, y))
   {
-    Debug("draw:DrawGraphicThruMask", "x = %d,y = %d, graphic = %d",
+    Debug("draw:DrawGraphicThruMask", "x = %d, y = %d, graphic = %d",
 	  x, y, graphic);
     Debug("draw:DrawGraphicThruMask", "This should never happen!");
 
@@ -1747,7 +1747,7 @@ void DrawFixedGraphicThruMask(int x, int y, int graphic, int frame)
 #if DEBUG
   if (!IN_SCR_FIELD(x, y))
   {
-    Debug("draw:DrawFixedGraphicThruMask", "x = %d,y = %d, graphic = %d",
+    Debug("draw:DrawFixedGraphicThruMask", "x = %d, y = %d, graphic = %d",
 	  x, y, graphic);
     Debug("draw:DrawFixedGraphicThruMask", "This should never happen!");
 
@@ -1821,7 +1821,7 @@ void DrawSizedGraphicThruMaskExt(DrawBuffer *d, int x, int y, int graphic,
 
 void DrawMiniGraphic(int x, int y, int graphic)
 {
-  DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic);
+  DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX, SY + y * MINI_TILEY, graphic);
   MarkTileDirty(x / 2, y / 2);
 }
 
@@ -2024,9 +2024,9 @@ static void DrawGraphicShifted(int x, int y, int dx, int dy,
   }
 
   if (graphic_info[graphic].double_movement)	// EM style movement images
-    DrawGraphicShiftedDouble(x, y, dx, dy, graphic, frame, cut_mode,mask_mode);
+    DrawGraphicShiftedDouble(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
   else
-    DrawGraphicShiftedNormal(x, y, dx, dy, graphic, frame, cut_mode,mask_mode);
+    DrawGraphicShiftedNormal(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
 }
 
 static void DrawGraphicShiftedThruMask(int x, int y, int dx, int dy,
@@ -2711,7 +2711,7 @@ void DrawLevelField(int x, int y)
     DrawScreenField(SCREENX(x), SCREENY(y));
   else if (IS_MOVING(x, y))
   {
-    int newx,newy;
+    int newx, newy;
 
     Moving2Blocked(x, y, &newx, &newy);
     if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
@@ -3008,19 +3008,6 @@ void ShowEnvelope(int envelope_nr)
   BackToFront();
 }
 
-void ShowEnvelope_MM(int envelope_nr)
-{
-  BlitBitmap(backbuffer, bitmap_db_field, REAL_SX, REAL_SY,
-	     FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
-
-  ShowEnvelope(envelope_nr);
-
-  SetDrawtoField(DRAW_TO_BACKBUFFER);
-
-  BlitBitmap(bitmap_db_field, backbuffer, REAL_SX, REAL_SY,
-	     FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY);
-}
-
 static void PrepareEnvelopeRequestToScreen(Bitmap *bitmap, int sx, int sy,
 					   int xsize, int ysize)
 {
@@ -3418,7 +3405,7 @@ static void DrawPreviewElement(int dst_x, int dst_y, int element, int tilesize)
 
 void DrawLevel(int draw_background_mask)
 {
-  int x,y;
+  int x, y;
 
   SetMainBackgroundImage(IMG_BACKGROUND_PLAYING);
   SetDrawBackgroundMask(draw_background_mask);
@@ -3435,7 +3422,7 @@ void DrawLevel(int draw_background_mask)
 void DrawSizedLevel(int size_x, int size_y, int scroll_x, int scroll_y,
 		    int tilesize)
 {
-  int x,y;
+  int x, y;
 
   for (x = 0; x < size_x; x++)
     for (y = 0; y < size_y; y++)
@@ -3446,7 +3433,7 @@ void DrawSizedLevel(int size_x, int size_y, int scroll_x, int scroll_y,
 
 void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
 {
-  int x,y;
+  int x, y;
 
   for (x = 0; x < size_x; x++)
     for (y = 0; y < size_y; y++)
@@ -3948,6 +3935,18 @@ void DrawFixedGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
     DrawFixedGraphicExt(dst_bitmap, x, y, graphic, frame);
 }
 
+void DrawSizedGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
+				  int graphic, int sync_frame, int tilesize,
+				  int mask_mode)
+{
+  int frame = getGraphicAnimationFrame(graphic, sync_frame);
+
+  if (mask_mode == USE_MASKING)
+    DrawSizedGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame, tilesize);
+  else
+    DrawSizedGraphicExt(dst_bitmap, x, y, graphic, frame, tilesize);
+}
+
 static void DrawGraphicAnimation(int x, int y, int graphic)
 {
   int lx = LEVELX(x), ly = LEVELY(y);
@@ -4075,7 +4074,7 @@ static int getPlayerGraphic(struct PlayerInfo *player, int move_dir)
     return graphic;
   }
   else
-    return el_act_dir2img(player->artwork_element, player->GfxAction,move_dir);
+    return el_act_dir2img(player->artwork_element, player->GfxAction, move_dir);
 }
 
 static boolean equalGraphics(int graphic1, int graphic2)
@@ -8229,6 +8228,10 @@ int map_element_RND_to_MM(int element_rnd)
 	  element_rnd <= EL_MM_END_2 ?
 	  EL_MM_START_2_NATIVE + element_rnd - EL_MM_START_2 :
 
+	  element_rnd >= EL_MM_START_3 &&
+	  element_rnd <= EL_MM_END_3 ?
+	  EL_MM_START_3_NATIVE + element_rnd - EL_MM_START_3 :
+
 	  element_rnd >= EL_CHAR_START &&
 	  element_rnd <= EL_CHAR_END ?
 	  EL_MM_CHAR_START_NATIVE + element_rnd - EL_CHAR_START :
@@ -8254,6 +8257,10 @@ int map_element_MM_to_RND(int element_mm)
 	  element_mm <= EL_MM_END_2_NATIVE ?
 	  EL_MM_START_2 + element_mm - EL_MM_START_2_NATIVE :
 
+	  element_mm >= EL_MM_START_3_NATIVE &&
+	  element_mm <= EL_MM_END_3_NATIVE ?
+	  EL_MM_START_3 + element_mm - EL_MM_START_3_NATIVE :
+
 	  element_mm >= EL_MM_CHAR_START_NATIVE &&
 	  element_mm <= EL_MM_CHAR_END_NATIVE ?
 	  EL_CHAR_START + element_mm - EL_MM_CHAR_START_NATIVE :