X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=d556beb821b7ea5f5292e1be98b8f1eb32ad5f0b;hb=2c54d1765fec2db1ab23e2d5b5fba927efa463ce;hp=d3909d5eedbfff6901940af9c64a692d8481f1fc;hpb=5c94351c5b8a12d8615b447b6275dd2f68615be4;p=rocksndiamonds.git

diff --git a/src/tools.c b/src/tools.c
index d3909d5e..d556beb8 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -523,7 +523,11 @@ void FadeExt(int fade_mask, int fade_mode)
 {
   static int fade_mode_skip = FADE_MODE_NONE;
   void (*draw_border_function)(void) = NULL;
-  Bitmap *bitmap = (fade_mode == FADE_MODE_CROSSFADE ? bitmap_db_cross : NULL);
+#if 0
+  Bitmap *bitmap = (fade_mode != FADE_MODE_FADE_IN ? bitmap_db_cross : NULL);
+#else
+  Bitmap *bitmap = (fade_mode & FADE_TYPE_TRANSFORM ? bitmap_db_cross : NULL);
+#endif
   int x, y, width, height;
   int fade_delay, post_delay;
 
@@ -531,6 +535,10 @@ void FadeExt(int fade_mask, int fade_mode)
 
   if (fade_mode & FADE_TYPE_SKIP)
   {
+#if 0
+    printf("::: will skip %d ... [%d]\n", fade_mode, fade_mode_skip);
+#endif
+
     fade_mode_skip = fade_mode;
 
     return;
@@ -599,6 +607,14 @@ void FadeExt(int fade_mask, int fade_mode)
 
 void FadeIn(int fade_mask)
 {
+#if 1
+  // printf("::: now fading in...\n");
+
+  if (fading.fade_mode & FADE_TYPE_TRANSFORM)
+    FadeExt(fade_mask, fading.fade_mode);
+  else
+    FadeExt(fade_mask, FADE_MODE_FADE_IN);
+#else
 #if 1
   if (fading.fade_mode == FADE_MODE_CROSSFADE)
     FadeExt(fade_mask, FADE_MODE_CROSSFADE);
@@ -607,10 +623,19 @@ void FadeIn(int fade_mask)
 #else
   FadeExt(fade_mask, FADE_MODE_FADE_IN);
 #endif
+#endif
 }
 
 void FadeOut(int fade_mask)
 {
+#if 1
+  // printf("::: fading.fade_mode == %d\n", fading.fade_mode);
+
+  if (fading.fade_mode & FADE_TYPE_TRANSFORM)
+    FadeCrossSaveBackbuffer();
+  else
+    FadeExt(fade_mask, FADE_MODE_FADE_OUT);
+#else
 #if 1
   if (fading.fade_mode == FADE_MODE_CROSSFADE)
     FadeCrossSaveBackbuffer();
@@ -619,6 +644,7 @@ void FadeOut(int fade_mask)
 #else
   FadeExt(fade_mask, FADE_MODE_FADE_OUT);
 #endif
+#endif
 }
 
 void FadeCross(int fade_mask)