X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ftools.c;h=ba774925f95d7128c5a3c9c8be3f48cbdf8b9aa8;hp=d556beb821b7ea5f5292e1be98b8f1eb32ad5f0b;hb=0838017832a108ba365ea0efb851fc8c4d5f3aa5;hpb=2c54d1765fec2db1ab23e2d5b5fba927efa463ce diff --git a/src/tools.c b/src/tools.c index d556beb8..ba774925 100644 --- a/src/tools.c +++ b/src/tools.c @@ -557,6 +557,11 @@ void FadeExt(int fade_mask, int fade_mode) return; } +#if 1 + if (global.autoplay_leveldir) + fading.fade_mode = FADE_MODE_NONE; +#endif + #if 1 if (fading.fade_mode == FADE_MODE_NONE) return; @@ -1807,15 +1812,29 @@ void getPreviewGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y, { 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;