X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.c;h=02938e3544e07825eabf196ea4b01faafd5a81fb;hb=522cba3565ad60664933d454f83518961deb41c5;hp=8df809cd787ba19cdc91041866a11d432c397597;hpb=b003831ec2ccf7b14d2aa094466bdeb6c2f1d048;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 8df809cd..02938e35 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -209,11 +209,10 @@ void InitGfxWindowInfo(int win_xsize, int win_ysize)
   ReCreateBitmap(&gfx.background_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
 
 #if defined(TARGET_SDL2)
-#if USE_FINAL_SCREEN_BITMAP
   ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
-#endif
 #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);
@@ -243,7 +242,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;
 }
@@ -380,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;
 
@@ -766,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,
@@ -781,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,
@@ -886,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)