X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=c0e5d776a10fdfec799160a73a29ae0735107276;hb=7b387b9e5e8095a01c18ea041f19d71be83146b9;hp=5ba6da71edb1fbd6a6785a659a336772d941d8eb;hpb=5c94351c5b8a12d8615b447b6275dd2f68615be4;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 5ba6da71..c0e5d776 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -203,14 +203,18 @@
 #define FADE_TYPE_NONE		0
 #define FADE_TYPE_FADE_IN	(1 << 0)
 #define FADE_TYPE_FADE_OUT	(1 << 1)
-#define FADE_TYPE_CROSS		(1 << 2)
-#define FADE_TYPE_SKIP		(1 << 3)
+#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_CROSSFADE	(FADE_TYPE_FADE_IN | FADE_TYPE_CROSS)
+#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)
 
@@ -808,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;
@@ -1045,7 +1050,7 @@ struct TextPosInfo
   int x, y;
   int width, height;
   int align, valign;
-  int chars;
+  int size;
   int font, font_alt;
 };