X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=acd36018b2614036196301205967ab4e581f6e5b;hb=ac39e3a146d0d95f1738e33d21fd76612f09b093;hp=a5ebc4f05e2a5fd05e39986a918fb74b05892427;hpb=d0409bd76aa84a8745ec2ea6d8a5480c8bea0bcd;p=rocksndiamonds.git diff --git a/src/libgame/system.c b/src/libgame/system.c index a5ebc4f0..acd36018 100644 --- a/src/libgame/system.c +++ b/src/libgame/system.c @@ -201,22 +201,26 @@ void InitGfxDoor3Info(int ex, int ey, int exsize, int eysize) void InitGfxWindowInfo(int win_xsize, int win_ysize) { - gfx.win_xsize = win_xsize; - gfx.win_ysize = win_ysize; - - gfx.background_bitmap_mask = REDRAW_NONE; - - ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH); + if (win_xsize != gfx.win_xsize || win_ysize != gfx.win_ysize) + { + ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH); #if defined(TARGET_SDL2) - ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH); + ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH); #endif - ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize, DEFAULT_DEPTH); - ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize, DEFAULT_DEPTH); - ReCreateBitmap(&gfx.fade_bitmap_black, win_xsize, win_ysize, DEFAULT_DEPTH); + ReCreateBitmap(&gfx.fade_bitmap_backup, win_xsize, win_ysize, DEFAULT_DEPTH); + ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize, DEFAULT_DEPTH); + ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize, DEFAULT_DEPTH); + ReCreateBitmap(&gfx.fade_bitmap_black, win_xsize, win_ysize, DEFAULT_DEPTH); - ClearRectangle(gfx.fade_bitmap_black, 0, 0, win_xsize, win_ysize); + ClearRectangle(gfx.fade_bitmap_black, 0, 0, win_xsize, win_ysize); + } + + gfx.win_xsize = win_xsize; + gfx.win_ysize = win_ysize; + + gfx.background_bitmap_mask = REDRAW_NONE; } void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height) @@ -241,7 +245,7 @@ void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void)) gfx.draw_busy_anim_function = draw_busy_anim_function; } -void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int)) +void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int)) { gfx.draw_global_anim_function = draw_global_anim_function; } @@ -670,7 +674,7 @@ void BlitBitmapTiled(Bitmap *src_bitmap, Bitmap *dst_bitmap, } } -void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, +void FadeRectangle(int x, int y, int width, int height, int fade_mode, int fade_delay, int post_delay, void (*draw_border_function)(void)) { @@ -678,7 +682,7 @@ void FadeRectangle(Bitmap *bitmap_cross, int x, int y, int width, int height, if (!InClippedRectangle(backbuffer, &x, &y, &width, &height, TRUE)) return; - SDLFadeRectangle(bitmap_cross, x, y, width, height, + SDLFadeRectangle(x, y, width, height, fade_mode, fade_delay, post_delay, draw_border_function); }