X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=8fdc788190093236f29066c9f57c41632c319c86;hb=f7704e2d22e9499efe6380e0c916c2bd4918e4be;hp=c175d59faa05ffebdfd8d78ac95087e610ecf92f;hpb=e8b94b38c4be1bf3ada57ade9eb3a96adb080775;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index c175d59f..8fdc7881 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -426,6 +426,21 @@
 
 #define NUM_TREE_TYPES		4
 
+#define INFOTEXT_UNDEFINED	""
+#define INFOTEXT_GRAPHICS_DIR	"Custom Graphics"
+#define INFOTEXT_SOUNDS_DIR	"Custom Sounds"
+#define INFOTEXT_MUSIC_DIR	"Custom Music"
+#define INFOTEXT_LEVEL_DIR	"Level Sets"
+
+#define TREE_INFOTEXT(t)	((t) == TREE_TYPE_LEVEL_DIR ?		\
+				 INFOTEXT_LEVEL_DIR :			\
+				 (t) == TREE_TYPE_GRAPHICS_DIR ?	\
+				 INFOTEXT_GRAPHICS_DIR :		\
+				 (t) == TREE_TYPE_SOUNDS_DIR ?		\
+				 INFOTEXT_SOUNDS_DIR :			\
+				 (t) == TREE_TYPE_MUSIC_DIR ?		\
+				 INFOTEXT_MUSIC_DIR :			\
+				 INFOTEXT_UNDEFINED)
 
 /* values for artwork handling */
 #define LEVELDIR_ARTWORK_SET_PTR(leveldir, type)			\
@@ -526,7 +541,10 @@ struct ProgramInfo
 {
   char *command_basepath;	/* directory that contains the program */
   char *command_basename;	/* base filename of the program binary */
-  char *userdata_directory;	/* personal user data 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;
@@ -534,6 +552,7 @@ struct ProgramInfo
 
   char *x11_icon_filename;
   char *x11_iconmask_filename;
+  char *sdl_icon_filename;
   char *msdos_cursor_filename;
 
   char *cookie_prefix;
@@ -570,12 +589,20 @@ struct OptionInfo
   boolean debug;
 };
 
+struct ScreenModeInfo
+{
+  int width, height;
+};
+
 struct VideoSystemInfo
 {
   int default_depth;
   int width, height, depth;
+
   boolean fullscreen_available;
   boolean fullscreen_enabled;
+  struct ScreenModeInfo *fullscreen_modes;
+  char *fullscreen_mode_current;
 };
 
 struct AudioSystemInfo
@@ -751,6 +778,7 @@ struct SetupInfo
   boolean skip_levels;
   boolean time_limit;
   boolean fullscreen;
+  char *fullscreen_mode;
   boolean ask_on_escape;
   boolean ask_on_escape_editor;
   boolean quick_switch;
@@ -826,6 +854,8 @@ struct TreeInfo
   int color;		/* color to use on selection screen for this level */
   char *class_desc;	/* description of level series class */
   int handicap_level;	/* number of the lowest unsolved level */
+
+  char *infotext;	/* optional text to describe the tree type (headline) */
 };
 
 typedef struct TreeInfo TreeInfo;
@@ -949,6 +979,11 @@ struct ArtworkListInfo
   void (*free_artwork)(void *);			/* destructor function */
 };
 
+struct XY
+{
+  int x, y;
+};
+
 
 /* ========================================================================= */
 /* exported variables                                                        */
@@ -990,7 +1025,7 @@ extern int			FrameCounter;
 /* function definitions */
 
 void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
-		     char *, char *, char *, int);
+		     char *, char *, char *, char *, char *, int);
 
 void InitExitFunction(void (*exit_function)(int));
 void InitPlatformDependentStuff(void);
@@ -1012,7 +1047,7 @@ Bitmap *CreateBitmapStruct(void);
 Bitmap *CreateBitmap(int, int, int);
 void FreeBitmap(Bitmap *);
 void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
-void FadeScreen(Bitmap *bitmap, int, int, int);
+void FadeRectangle(Bitmap *bitmap, int, int, int, int, int, int, int);
 void FillRectangle(Bitmap *, int, int, int, int, Pixel);
 void ClearRectangle(Bitmap *, int, int, int, int);
 void ClearRectangleOnBackground(Bitmap *, int, int, int, int);
@@ -1057,6 +1092,7 @@ void PeekEvent(Event *event);
 Key GetEventKey(KeyEvent *, boolean);
 KeyMod HandleKeyModState(Key, int);
 KeyMod GetKeyModState();
+KeyMod GetKeyModStateFromEvents();
 boolean CheckCloseWindowEvent(ClientMessageEvent *);
 
 void InitJoysticks();