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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 511355d3..d9cd579a 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -290,6 +290,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;
@@ -311,20 +323,12 @@ struct GfxInfo
   int background_bitmap_mask;
 
   boolean menu_main_hide_static_text;
-};
 
-struct FontInfo
-{
-  Bitmap *bitmap_initial;
-  Bitmap *bitmap_big;
-  Bitmap *bitmap_medium;
-  Bitmap *bitmap_small;
-  Bitmap *bitmap_tile;
-};
+  int num_fonts;
+  struct FontBitmapInfo *font_bitmap_info;
+  int (*select_font_function)(int);
 
-struct AnimInfo
-{
-  int random_frame;
+  int anim_random_frame;
 };
 
 struct JoystickInfo
@@ -581,7 +585,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;