rnd-20070403-1-src

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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 331522ac7e398d2365c69513173a581c579211e7..c0e5d776a10fdfec799160a73a29ae0735107276 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -196,11 +196,30 @@
 #define ANIM_VERTICAL          (1 << 11)
 #define ANIM_CENTERED          (1 << 12)
 #define ANIM_STATIC_PANEL      (1 << 13)
-#define ANIM_FADE              (1 << 14)
-#define ANIM_CROSSFADE         (1 << 15)
 
 #define ANIM_DEFAULT           ANIM_LOOP
 
+/* values for fade mode */
+#define FADE_TYPE_NONE         0
+#define FADE_TYPE_FADE_IN      (1 << 0)
+#define FADE_TYPE_FADE_OUT     (1 << 1)
+#define FADE_TYPE_TRANSFORM    (1 << 2)
+#define FADE_TYPE_CROSSFADE    (1 << 3)
+#define FADE_TYPE_MELT         (1 << 4)
+#define FADE_TYPE_SKIP         (1 << 5)
+
+#define FADE_MODE_NONE         (FADE_TYPE_NONE)
+#define FADE_MODE_FADE_IN      (FADE_TYPE_FADE_IN)
+#define FADE_MODE_FADE_OUT     (FADE_TYPE_FADE_OUT)
+#define FADE_MODE_FADE         (FADE_TYPE_FADE_IN | FADE_TYPE_FADE_OUT)
+#define FADE_MODE_TRANSFORM    (FADE_TYPE_TRANSFORM | FADE_TYPE_FADE_IN)
+#define FADE_MODE_CROSSFADE    (FADE_MODE_TRANSFORM | FADE_TYPE_CROSSFADE)
+#define FADE_MODE_MELT         (FADE_MODE_TRANSFORM | FADE_TYPE_MELT)
+#define FADE_MODE_SKIP_FADE_IN (FADE_TYPE_SKIP | FADE_TYPE_FADE_IN)
+#define FADE_MODE_SKIP_FADE_OUT        (FADE_TYPE_SKIP | FADE_TYPE_FADE_OUT)
+
+#define FADE_MODE_DEFAULT      FADE_MODE_FADE
+
 /* values for text alignment */
 #define ALIGN_LEFT             (1 << 0)
 #define ALIGN_RIGHT            (1 << 1)
@@ -244,10 +263,6 @@
 #define REDRAW_FPS             (1 << 11)
 #define REDRAWTILES_THRESHOLD  (SCR_FIELDX * SCR_FIELDY / 2)
 
-#define FADE_MODE_FADE_IN      0
-#define FADE_MODE_FADE_OUT     1
-#define FADE_MODE_CROSSFADE    2
-
 #define IN_GFX_SCREEN(x, y)    (x >= gfx.sx && x < gfx.sx + gfx.sxsize && \
                                 y >= gfx.sy && y < gfx.sy + gfx.sysize)
 #define IN_GFX_DOOR(x, y)      (x >= gfx.dx && x < gfx.dx + gfx.dxsize && \
@@ -692,6 +707,7 @@ struct GfxInfo
   int num_fonts;
   struct FontBitmapInfo *font_bitmap_info;
   int (*select_font_function)(int);
+  int (*get_font_from_token_function)(char *);
 
   int anim_random_frame;
 };
@@ -796,6 +812,7 @@ struct SetupInfo
   boolean double_buffering;
   boolean direct_draw;         /* !double_buffering (redundant!) */
   boolean scroll_delay;
+  boolean scroll_delay_value;
   boolean soft_scrolling;
   boolean fade_screens;
   boolean autorecord;
@@ -1033,7 +1050,7 @@ struct TextPosInfo
   int x, y;
   int width, height;
   int align, valign;
-  int chars;
+  int size;
   int font, font_alt;
 };