X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsystem.c;h=0e7169f4d79c4eb4a339f2c22a63dc920684813c;hb=f7fcf0207e03bea13618e718f522c15d9120460c;hp=595daad7bd3fc148b43b0035fd8bc49b50d51f75;hpb=2176d1de29652bc9e8db1baa283fdc1c4e99e674;p=rocksndiamonds.git

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 595daad7..0e7169f4 100644
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -50,6 +50,7 @@ DrawBuffer	       *drawto = NULL;
 
 int			button_status = MB_NOT_PRESSED;
 boolean			motion_status = FALSE;
+int			wheel_steps = DEFAULT_WHEEL_STEPS;
 #if defined(TARGET_SDL2)
 boolean			keyrepeat_status = TRUE;
 #endif
@@ -201,22 +202,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);
 
 #if defined(TARGET_SDL2)
-  ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize, DEFAULT_DEPTH);
+    ReCreateBitmap(&gfx.final_screen_bitmap, win_xsize, win_ysize);
 #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);
+    ReCreateBitmap(&gfx.fade_bitmap_source, win_xsize, win_ysize);
+    ReCreateBitmap(&gfx.fade_bitmap_target, win_xsize, win_ysize);
+    ReCreateBitmap(&gfx.fade_bitmap_black,  win_xsize, win_ysize);
+
+    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 +246,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;
 }
@@ -378,6 +383,9 @@ void InitVideoBuffer(int width, int height, int depth, boolean fullscreen)
 
   video.window_scaling_available = WINDOW_SCALING_STATUS;
 
+  video.frame_delay = 0;
+  video.frame_delay_value = GAME_FRAME_DELAY;
+
   SDLInitVideoBuffer(fullscreen);
 
   video.initialized = TRUE;
@@ -437,9 +445,9 @@ Bitmap *CreateBitmap(int width, int height, int depth)
   return new_bitmap;
 }
 
-void ReCreateBitmap(Bitmap **bitmap, int width, int height, int depth)
+void ReCreateBitmap(Bitmap **bitmap, int width, int height)
 {
-  Bitmap *new_bitmap = CreateBitmap(width, height, depth);
+  Bitmap *new_bitmap = CreateBitmap(width, height, DEFAULT_DEPTH);
 
   if (*bitmap == NULL)
   {
@@ -667,7 +675,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))
 {
@@ -675,7 +683,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);
 }
 
@@ -885,6 +893,16 @@ boolean SetVideoMode(boolean 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)
 {
   if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)||
@@ -959,13 +977,6 @@ void ReloadCustomImage(Bitmap *bitmap, char *basename)
   free(new_bitmap);
 }
 
-Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
-{
-  Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
-
-  return dst_bitmap;
-}
-
 static void SetMaskedBitmapSurface(Bitmap *bitmap)
 {
   if (bitmap == NULL)
@@ -985,6 +996,15 @@ static void SetMaskedBitmapSurface(Bitmap *bitmap)
   SDL_SetColorKey(surface, UNSET_TRANSPARENT_PIXEL, 0);
 }
 
+static Bitmap *ZoomBitmap(Bitmap *src_bitmap, int zoom_width, int zoom_height)
+{
+  Bitmap *dst_bitmap = SDLZoomBitmap(src_bitmap, zoom_width, zoom_height);
+
+  SetMaskedBitmapSurface(dst_bitmap);
+
+  return dst_bitmap;
+}
+
 void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
 {
   if (bitmaps[IMG_BITMAP_CUSTOM])
@@ -1009,8 +1029,6 @@ void ReCreateGameTileSizeBitmap(Bitmap **bitmaps)
 
   bitmaps[IMG_BITMAP_CUSTOM] = bitmap_new;
   bitmaps[IMG_BITMAP_GAME]   = bitmap_new;
-
-  SetMaskedBitmapSurface(bitmap_new);
 }
 
 static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
@@ -1178,12 +1196,6 @@ static void CreateScaledBitmaps(Bitmap **bitmaps, int zoom_factor,
     bitmaps[IMG_BITMAP_32x32] = tmp_bitmap_1;
   }
 
-  // create corresponding bitmaps for masked blitting
-  for (i = 0; i < NUM_IMG_BITMAPS; i++)
-    if (bitmaps[i] != NULL &&
-	bitmaps[i] != old_bitmap)
-      SetMaskedBitmapSurface(bitmaps[i]);
-
   UPDATE_BUSY_STATE();
 
   print_timestamp_done("CreateScaledBitmaps");