X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fsystem.h;h=bba4a30523e0358341819b04a5f250fe2247c8f7;hb=3fb68b18f28034e492534fb3b5579fd1da888292;hp=511355d31e0ce28a64ce8d9f98393065978d5b12;hpb=84a3ee86461e2311032274e0b7d7a857e02a76ab;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 511355d3..bba4a305 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -101,6 +101,15 @@
 #define MB_MIDDLEBUTTON		2
 #define MB_RIGHTBUTTON		3
 
+/* values for animation mode (frame order and direction) */
+#define ANIM_NONE		0
+#define ANIM_LOOP		(1 << 0)
+#define ANIM_LINEAR		(1 << 1)
+#define ANIM_PINGPONG		(1 << 2)
+#define ANIM_PINGPONG2		(1 << 3)
+#define ANIM_RANDOM		(1 << 4)
+#define ANIM_REVERSE		(1 << 5)
+
 /* values for redraw_mask */
 #define REDRAW_NONE		(0)
 #define REDRAW_ALL		(1 << 0)
@@ -147,6 +156,9 @@
 /* default value for undefined filename */
 #define UNDEFINED_FILENAME	"[NONE]"
 
+/* default value for undefined parameter */
+#define ARG_DEFAULT		"[DEFAULT]"
+
 /* default values for undefined configuration file parameters */
 #define ARG_UNDEFINED		"-1000000"
 #define ARG_UNDEFINED_VALUE	(atoi(ARG_UNDEFINED))
@@ -290,6 +302,18 @@ struct AudioSystemInfo
   int first_sound_channel;
 };
 
+struct FontBitmapInfo
+{
+  Bitmap *bitmap;
+  int src_x, src_y;		/* start position of animation frames */
+  int width, height;		/* width/height of each animation frame */
+  int draw_x, draw_y;		/* offset for drawing font characters */
+
+#if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND)
+  Pixmap *clip_mask;		/* single-char-only clip mask array for X11 */
+#endif
+};
+
 struct GfxInfo
 {
   int sx, sy;
@@ -310,21 +334,11 @@ struct GfxInfo
   Bitmap *background_bitmap;
   int background_bitmap_mask;
 
-  boolean menu_main_hide_static_text;
-};
+  int num_fonts;
+  struct FontBitmapInfo *font_bitmap_info;
+  int (*select_font_function)(int);
 
-struct FontInfo
-{
-  Bitmap *bitmap_initial;
-  Bitmap *bitmap_big;
-  Bitmap *bitmap_medium;
-  Bitmap *bitmap_small;
-  Bitmap *bitmap_tile;
-};
-
-struct AnimInfo
-{
-  int random_frame;
+  int anim_random_frame;
 };
 
 struct JoystickInfo
@@ -380,6 +394,12 @@ struct SetupShortcutInfo
   Key toggle_pause;
 };
 
+struct SetupSystemInfo
+{
+  char *sdl_audiodriver;
+  int audio_fragment_size;
+};
+
 struct SetupInfo
 {
   char *player_name;
@@ -412,6 +432,8 @@ struct SetupInfo
   struct SetupEditorInfo editor;
   struct SetupShortcutInfo shortcut;
   struct SetupInputInfo input[MAX_PLAYERS];
+  struct SetupSystemInfo system;
+  struct OptionInfo options;
 };
 
 #define TREE_TYPE_GENERIC		0
@@ -581,7 +603,6 @@ extern struct OptionInfo	options;
 extern struct VideoSystemInfo	video;
 extern struct AudioSystemInfo	audio;
 extern struct GfxInfo		gfx;
-extern struct FontInfo		font;
 extern struct AnimInfo		anim;
 extern struct ArtworkInfo	artwork;
 extern struct JoystickInfo	joystick;