X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=86dc01ac0ab0c6ac995fa8fc7595ffee8b632337;hb=fdd2829c52e8f4ec204e089b5d35ed5aef50e4e6;hp=d0a22f24ff030bc9d609626e9ea94782d69847ed;hpb=4e745044fe35b4b093b1490a6e3da0fe4ee512de;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index d0a22f24..86dc01ac 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -311,11 +311,6 @@
 				 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)
 #define IN_GFX_FIELD_FULL(x, y)	(x >= gfx.real_sx && \
@@ -438,7 +433,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		"/"
@@ -673,12 +673,13 @@ struct ProgramInfo
   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;
@@ -945,6 +946,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 +973,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;