X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=97fed8a27063cefca1b2c2b7729e1b8f5ecfcecb;hb=5eabbc4d089dcf4de6ddcc78159efd6a9ecef978;hp=1011f1a93ca2d62c15e38f8d566bbe43947ecea7;hpb=d0409bd76aa84a8745ec2ea6d8a5480c8bea0bcd;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 1011f1a9..97fed8a2 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -47,9 +47,9 @@
 #define WINDOW_SCALING_NOT_AVAILABLE	FALSE
 #define WINDOW_SCALING_AVAILABLE	TRUE
 
-#define MIN_WINDOW_SCALING_PERCENT	50
+#define MIN_WINDOW_SCALING_PERCENT	30
 #define STD_WINDOW_SCALING_PERCENT	100
-#define MAX_WINDOW_SCALING_PERCENT	300
+#define MAX_WINDOW_SCALING_PERCENT	400
 #define STEP_WINDOW_SCALING_PERCENT	10
 
 /* values for window scaling quality */
@@ -192,11 +192,12 @@
 #define DRAW_GLOBAL_ANIM_STAGE_1	1
 #define DRAW_GLOBAL_ANIM_STAGE_2	2
 
-/* values for drawing target for global border */
-#define DRAW_BORDER_TO_BACKBUFFER	0
-#define DRAW_BORDER_TO_SCREEN		1
-#define DRAW_BORDER_TO_FADE_SOURCE	2
-#define DRAW_BORDER_TO_FADE_TARGET	3
+/* values for drawing target (various functions) */
+#define DRAW_TO_BACKBUFFER		0
+#define DRAW_TO_FIELDBUFFER		1
+#define DRAW_TO_SCREEN			2
+#define DRAW_TO_FADE_SOURCE		3
+#define DRAW_TO_FADE_TARGET		4
 
 /* values for move directions and special "button" key bitmasks */
 #define MV_NONE			0
@@ -836,6 +837,7 @@ struct GfxInfo
   Bitmap *background_bitmap;
   int background_bitmap_mask;
 
+  Bitmap *fade_bitmap_backup;
   Bitmap *fade_bitmap_source;
   Bitmap *fade_bitmap_target;
   Bitmap *fade_bitmap_black;
@@ -864,7 +866,7 @@ struct GfxInfo
   int anim_random_frame;
 
   void (*draw_busy_anim_function)(void);
-  void (*draw_global_anim_function)(int);
+  void (*draw_global_anim_function)(int, int);
   void (*draw_global_border_function)(int);
 
   int cursor_mode;
@@ -1365,7 +1367,7 @@ void InitGfxWindowInfo(int, int);
 void InitGfxScrollbufferInfo(int, int);
 void InitGfxClipRegion(boolean, int, int, int, int);
 void InitGfxDrawBusyAnimFunction(void (*draw_busy_anim_function)(void));
-void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int));
+void InitGfxDrawGlobalAnimFunction(void (*draw_global_anim_function)(int, int));
 void InitGfxDrawGlobalBorderFunction(void (*draw_global_border_function)(int));
 void InitGfxCustomArtworkInfo();
 void InitGfxOtherSettings();
@@ -1383,16 +1385,17 @@ void CloseVideoDisplay(void);
 void InitVideoBuffer(int, int, int, boolean);
 Bitmap *CreateBitmapStruct(void);
 Bitmap *CreateBitmap(int, int, int);
-void ReCreateBitmap(Bitmap **, int, int, int);
+void ReCreateBitmap(Bitmap **, int, int);
 void FreeBitmap(Bitmap *);
 void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
 void BlitBitmapTiled(Bitmap *, Bitmap *, int, int, int, int, int, int, int,int);
-void FadeRectangle(Bitmap *bitmap, int, int, int, int, int, int, int,
+void FadeRectangle(int, int, int, int, int, int, int,
 		   void (*draw_border_function)(void));
 void FillRectangle(Bitmap *, int, int, int, int, Pixel);
 void ClearRectangle(Bitmap *, int, int, int, int);
 void ClearRectangleOnBackground(Bitmap *, int, int, int, int);
 void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
+boolean DrawingDeactivated(int, int, int, int);
 boolean DrawingOnBackground(int, int);
 boolean DrawingAreaChanged();
 void BlitBitmapOnBackground(Bitmap *, Bitmap *, int, int, int, int, int, int);