white space changes

[rocksndiamonds.git] / src / libgame / system.h

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 23e37276319a986454f5062c206d6ce67572a898..02e58143fbb6668351aa67cc480da745574f1a45 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -482,9 +482,9 @@
 #define VALIGN_MIDDLE          (1 << 2)
 #define VALIGN_DEFAULT         VALIGN_TOP
 
-#define ALIGNED_XPOS(x,w,a)    ((a) == ALIGN_CENTER  ? (x) - (w) / 2 : \
+#define ALIGNED_XPOS(x, w, a)  ((a) == ALIGN_CENTER  ? (x) - (w) / 2 : \
                                 (a) == ALIGN_RIGHT   ? (x) - (w) : (x))
-#define ALIGNED_YPOS(y,h,v)    ((v) == VALIGN_MIDDLE ? (y) - (h) / 2 : \
+#define ALIGNED_YPOS(y, h, v)  ((v) == VALIGN_MIDDLE ? (y) - (h) / 2 : \
                                 (v) == VALIGN_BOTTOM ? (y) - (h) : (y))
 #define ALIGNED_TEXT_XPOS(p)   ALIGNED_XPOS((p)->x, (p)->width,  (p)->align)
 #define ALIGNED_TEXT_YPOS(p)   ALIGNED_YPOS((p)->y, (p)->height, (p)->valign)
@@ -607,7 +607,7 @@
                                         JOY_NO_ACTION)
 
 // maximum number of level sets in the level set history
-#define MAX_LEVELDIR_HISTORY   12
+#define MAX_LEVELDIR_HISTORY   100
 
 // default name for empty highscore entry
 #define EMPTY_PLAYER_NAME      "no name"
@@ -633,10 +633,13 @@
 // default value for undefined password
 #define UNDEFINED_PASSWORD     "[undefined]"
 
-// default value for undefined parameter
+// default value for undefined string parameter
+#define ARG_UNDEFINED_STRING   "[undefined]"
+
+// default value for default string parameter
 #define ARG_DEFAULT            "[DEFAULT]"
 
-// default values for undefined configuration file parameters
+// default values for undefined numerical parameter (as string and integer)
 #define ARG_UNDEFINED          "-1000000"
 #define ARG_UNDEFINED_VALUE    (-1000000)
 
@@ -706,13 +709,6 @@
 
 #define FALLBACK_TEXT_FILENAME "fallback.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           "/"
 
@@ -1027,6 +1023,7 @@ struct ProgramInfo
   char *userdata_subdir;       // personal user game data directory
   char *userdata_path;         // resulting full path to game data directory
 
+  char *program_basename;
   char *program_title;
   char *window_title;
 
@@ -1034,9 +1031,9 @@ struct ProgramInfo
 
   char *cookie_prefix;
 
-  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)
+  char *log_filename;                  // filename for log messages
+  FILE *log_file;                      // file handle for log files
+  FILE *log_file_default;              // default log file handle
 
   int version_super;
   int version_major;
@@ -1944,7 +1941,7 @@ extern int                        FrameCounter;
 
 // function definitions
 
-void InitProgramInfo(char *, char *, char *, char *, char *, char *,
+void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
                     char *, int);
 void InitNetworkInfo(boolean, boolean, boolean, char *, int);
 void InitRuntimeInfo(void);
@@ -2001,7 +1998,7 @@ Bitmap *CreateBitmap(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 BlitBitmapTiled(Bitmap *, Bitmap *, int, 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);
@@ -2020,7 +2017,7 @@ void BlitToScreenMasked(Bitmap *, int, int, int, int, int, int);
 void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
 void DrawLines(Bitmap *, struct XY *, int, Pixel);
 Pixel GetPixel(Bitmap *, int, int);
-Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
+Pixel GetPixelFromRGB(Bitmap *, unsigned int, unsigned int, unsigned int);
 
 void KeyboardAutoRepeatOn(void);
 void KeyboardAutoRepeatOff(void);