X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=4e53f626d624d0676dcb88bff81a9873be2aa0ef;hb=0c454763268d571be71d2c7a633f5bd855d0ad0b;hp=a52b4ec201da7e9f2403ed5e73bf0406442d9cde;hpb=0a69f419ffadee5822bc103be9e85d378e0d0274;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index a52b4ec2..4e53f626 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -207,9 +207,17 @@ void InitGfxWindowInfo(int win_xsize, int win_ysize)
   gfx.background_bitmap_mask = REDRAW_NONE;
 
   ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
-#if USE_FINAL_SCREEN_BITMAP
+
+#if defined(TARGET_SDL2)
   ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
 #endif
+
+  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);
 }
 
 void InitGfxScrollbufferInfo(int scrollbuffer_width, int scrollbuffer_height)
@@ -234,11 +242,16 @@ void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void))
   gfx.draw_busy_anim_function = draw_busy_anim_function;
 }
 
-void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(void))
+void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int))
 {
   gfx.draw_global_anim_function = draw_global_anim_function;
 }
 
+void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int))
+{
+  gfx.draw_global_border_function = draw_global_border_function;
+}
+
 void InitGfxCustomArtworkInfo()
 {
   gfx.override_level_graphics = FALSE;
@@ -366,7 +379,10 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
 
   video.window_scaling_available = WINDOW_SCALING_STATUS;
 
-  SDLInitVideoBuffer(&backbuffer, &window, fullscreen);
+  video.frame_delay = 0;
+  video.frame_delay_value = GAME_FRAME_DELAY;
+
+  SDLInitVideoBuffer(fullscreen);
 
   video.initialized = TRUE;
 
@@ -655,7 +671,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))
 {
@@ -663,7 +679,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);
 }
 
@@ -752,12 +768,11 @@ void BlitToScreen(Bitmap *bitmap,
   if (bitmap == NULL)
     return;
 
-#if USE_FINAL_SCREEN_BITMAP
-  BlitBitmap(bitmap, gfx.final_screen_bitmap, src_x, src_y,
-	     width, height, dst_x, dst_y);
-#else
-  BlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y);
-#endif
+  if (video.screen_rendering_mode == SPECIAL_RENDERING_BITMAP)
+    BlitBitmap(bitmap, gfx.final_screen_bitmap, src_x, src_y,
+	       width, height, dst_x, dst_y);
+  else
+    BlitTexture(bitmap, src_x, src_y, width, height, dst_x, dst_y);
 }
 
 void BlitToScreenMasked(Bitmap *bitmap,
@@ -767,12 +782,11 @@ void BlitToScreenMasked(Bitmap *bitmap,
   if (bitmap == NULL)
     return;
 
-#if USE_FINAL_SCREEN_BITMAP
-  BlitBitmapMasked(bitmap, gfx.final_screen_bitmap, src_x, src_y,
-		   width, height, dst_x, dst_y);
-#else
-  BlitTextureMasked(bitmap, src_x, src_y, width, height, dst_x, dst_y);
-#endif
+  if (video.screen_rendering_mode == SPECIAL_RENDERING_BITMAP)
+    BlitBitmapMasked(bitmap, gfx.final_screen_bitmap, src_x, src_y,
+		     width, height, dst_x, dst_y);
+  else
+    BlitTextureMasked(bitmap, src_x, src_y, width, height, dst_x, dst_y);
 }
 
 void DrawSimpleBlackLine(Bitmap *bitmap, int from_x, int from_y,
@@ -872,7 +886,17 @@ void KeyboardAutoRepeatOff(void)
 
 boolean SetVideoMode(boolean fullscreen)
 {
-  return SDLSetVideoMode(&backbuffer, fullscreen);
+  return SDLSetVideoMode(fullscreen);
+}
+
+void SetVideoFrameDelay(unsigned int frame_delay_value)
+{
+  video.frame_delay_value = frame_delay_value;
+}
+
+unsigned int GetVideoFrameDelay()
+{
+  return video.frame_delay_value;
 }
 
 boolean ChangeVideoModeIfNeeded(boolean fullscreen)