{
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;
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;
return;
}
+#if 1
+ if (global.autoplay_leveldir)
+ fading.fade_mode = FADE_MODE_NONE;
+#endif
+
#if 1
if (fading.fade_mode == FADE_MODE_NONE)
return;
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);
#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();
#else
FadeExt(fade_mask, FADE_MODE_FADE_OUT);
#endif
+#endif
}
void FadeCross(int fade_mask)
{
int width_mult, width_div;
int height_mult, height_div;
- } offset_calc[4] =
+#if 1
+ }
+ offset_calc[6] =
+#else
+ offset_calc[4] =
+#endif
{
{ 0, 1, 0, 1 },
{ 0, 1, 2, 3 },
{ 1, 2, 2, 3 },
{ 3, 4, 2, 3 },
+#if 1
+ { 7, 8, 2, 3 },
+ { 15, 16, 2, 3 },
+#endif
};
+#if 1
+ int offset_calc_pos = (tilesize < MICRO_TILESIZE / 4 ||
+ tilesize > TILESIZE ? 5 : 5 - log_2(tilesize));
+#else
int offset_calc_pos = (tilesize < MICRO_TILESIZE || tilesize > TILESIZE ? 3 :
5 - log_2(tilesize));
+#endif
Bitmap *src_bitmap = graphic_info[graphic].bitmap;
int width_mult = offset_calc[offset_calc_pos].width_mult;
int width_div = offset_calc[offset_calc_pos].width_div;