X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsystem.h;h=fdda818ec8f4b7be172a2b2ccc8a1c930a72ce8b;hb=5e13b105ad48e61a5cd46941c61a16ad00445248;hp=d0a22f24ff030bc9d609626e9ea94782d69847ed;hpb=4e745044fe35b4b093b1490a6e3da0fe4ee512de;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index d0a22f24..fdda818e 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -255,7 +255,8 @@
 #define FADE_TYPE_TRANSFORM	(1 << 2)
 #define FADE_TYPE_CROSSFADE	(1 << 3)
 #define FADE_TYPE_MELT		(1 << 4)
-#define FADE_TYPE_SKIP		(1 << 5)
+#define FADE_TYPE_CURTAIN	(1 << 5)
+#define FADE_TYPE_SKIP		(1 << 6)
 
 #define FADE_MODE_NONE		(FADE_TYPE_NONE)
 #define FADE_MODE_FADE_IN	(FADE_TYPE_FADE_IN)
@@ -264,6 +265,7 @@
 #define FADE_MODE_TRANSFORM	(FADE_TYPE_TRANSFORM | FADE_TYPE_FADE_IN)
 #define FADE_MODE_CROSSFADE	(FADE_MODE_TRANSFORM | FADE_TYPE_CROSSFADE)
 #define FADE_MODE_MELT		(FADE_MODE_TRANSFORM | FADE_TYPE_MELT)
+#define FADE_MODE_CURTAIN	(FADE_MODE_TRANSFORM | FADE_TYPE_CURTAIN)
 #define FADE_MODE_SKIP_FADE_IN	(FADE_TYPE_SKIP | FADE_TYPE_FADE_IN)
 #define FADE_MODE_SKIP_FADE_OUT	(FADE_TYPE_SKIP | FADE_TYPE_FADE_OUT)
 
@@ -291,30 +293,14 @@
 #define REDRAW_NONE		(0)
 #define REDRAW_ALL		(1 << 0)
 #define REDRAW_FIELD		(1 << 1)
-#define REDRAW_TILES		(1 << 2)
-#define REDRAW_DOOR_1		(1 << 3)
-#define REDRAW_VIDEO_1		(1 << 4)
-#define REDRAW_VIDEO_2		(1 << 5)
-#define REDRAW_VIDEO_3		(1 << 6)
-#define REDRAW_MICROLEVEL	(1 << 7)
-#define REDRAW_MICROLABEL	(1 << 8)
-#define REDRAW_FROM_BACKBUFFER	(1 << 9)
-#define REDRAW_DOOR_2		(REDRAW_VIDEO_1 | \
-				 REDRAW_VIDEO_2 | \
-				 REDRAW_VIDEO_3)
-#define REDRAW_DOOR_3		(1 << 10)
+#define REDRAW_DOOR_1		(1 << 2)
+#define REDRAW_DOOR_2		(1 << 3)
+#define REDRAW_DOOR_3		(1 << 4)
+#define REDRAW_FPS		(1 << 5)
+
 #define REDRAW_DOORS		(REDRAW_DOOR_1 | \
 				 REDRAW_DOOR_2 | \
 				 REDRAW_DOOR_3)
-#define REDRAW_MAIN		(REDRAW_FIELD | \
-				 REDRAW_TILES | \
-				 REDRAW_MICROLEVEL)
-#define REDRAW_FPS		(1 << 11)
-
-/* on modern graphics systems and when using the SDL target, the old tile redraw
-   optimization can slow things down a lot due to many small blits compared to
-   one single playfield-sized blit (especially observed on Mac OS X with SDL) */
-#define REDRAWTILES_THRESHOLD	0
 
 #define IN_GFX_FIELD_PLAY(x, y)	(x >= gfx.sx && x < gfx.sx + gfx.sxsize && \
 				 y >= gfx.sy && y < gfx.sy + gfx.sysize)
@@ -438,7 +424,12 @@
 #define TAPEFILE_EXTENSION	"tape"
 #define SCOREFILE_EXTENSION	"score"
 
-#define ERROR_BASENAME		"stderr.txt"
+#define LOG_OUT_BASENAME	"stdout.txt"
+#define LOG_ERR_BASENAME	"stderr.txt"
+
+#define LOG_OUT_ID		0
+#define LOG_ERR_ID		1
+#define NUM_LOGS		2
 
 #define STRING_PARENT_DIRECTORY		".."
 #define STRING_TOP_DIRECTORY		"/"
@@ -666,19 +657,19 @@ struct ProgramInfo
   char *maindata_path;		/* main game data (installation) directory */
 
   char *userdata_subdir;	/* personal user game data directory */
-  char *userdata_subdir_unix;	/* personal user game data directory (Unix) */
   char *userdata_path;		/* resulting full path to game data directory */
 
   char *program_title;
   char *window_title;
   char *icon_title;
 
-  char *sdl_icon_filename;
+  char *icon_filename;
 
   char *cookie_prefix;
 
-  char *error_filename;		/* filename where to write error messages to */
-  FILE *error_file;		/* (used instead of 'stderr' on some systems) */
+  char *log_filename[NUM_LOGS];		/* log filenames for out/err messages */
+  FILE *log_file[NUM_LOGS];		/* log file handles for out/err files */
+  FILE *log_file_default[NUM_LOGS];	/* default log file handles (out/err) */
 
   int version_major;
   int version_minor;
@@ -796,8 +787,6 @@ struct GfxInfo
   int draw_deactivation_mask;
   int draw_background_mask;
 
-  boolean drawing_area_changed;
-
   Bitmap *field_save_buffer;
 
   Bitmap *background_bitmap;
@@ -945,6 +934,8 @@ struct SetupInternalInfo
   char *program_copyright;
   char *program_company;
 
+  char *program_icon_file;
+
   char *default_graphics_set;
   char *default_sounds_set;
   char *default_music_set;
@@ -970,7 +961,6 @@ struct SetupInfo
   boolean scroll_delay;
   boolean scroll_delay_value;
   char *engine_snapshot_mode;
-  boolean soft_scrolling;
   boolean fade_screens;
   boolean autorecord;
   boolean show_titlescreen;
@@ -991,6 +981,7 @@ struct SetupInfo
   int game_frame_delay;
   boolean sp_show_border_elements;
   boolean small_game_graphics;
+  boolean show_snapshot_buttons;
 
   char *graphics_set;
   char *sounds_set;
@@ -1289,7 +1280,6 @@ extern boolean			keyrepeat_status;
 #endif
 
 extern int			redraw_mask;
-extern int			redraw_tiles;
 
 extern int			FrameCounter;
 
@@ -1297,7 +1287,7 @@ extern int			FrameCounter;
 /* function definitions */
 
 void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
-		     char *, int);
+		     int);
 
 void SetWindowTitle();
 
@@ -1323,6 +1313,7 @@ void SetDrawBackgroundMask(int);
 void SetWindowBackgroundBitmap(Bitmap *);
 void SetMainBackgroundBitmap(Bitmap *);
 void SetDoorBackgroundBitmap(Bitmap *);
+void SetRedrawMaskFromArea(int, int, int, int);
 
 void LimitScreenUpdates(boolean);
 
@@ -1353,7 +1344,6 @@ Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
 
 void KeyboardAutoRepeatOn(void);
 void KeyboardAutoRepeatOff(void);
-boolean PointerInWindow(DrawWindow *);
 boolean SetVideoMode(boolean);
 boolean ChangeVideoModeIfNeeded(boolean);