X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=f9ab95f40e1b733eb7d4e3b1929d39b44d5e2bbc;hb=04575ef0d5f1551715fca1d1def889fd63b5c3ad;hp=d07b005f3dda4acc05a7b003259329fd9004b0f5;hpb=dff0e0c8702770fe23992f07964ebe9ed54e9f7c;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index d07b005f..f9ab95f4 100644
--- a/src/main.h
+++ b/src/main.h
@@ -821,7 +821,8 @@
 #define MAX_ELEMENT_NAME_LEN	32
 #define MAX_TAPES_PER_SET	1024
 #define MAX_SCORE_ENTRIES	100
-#define MAX_NUM_TITLE_SCREENS	5
+#define MAX_NUM_TITLE_IMAGES	5
+#define MAX_NUM_TITLE_MESSAGES	5
 
 #define MAX_NUM_AMOEBA		100
 
@@ -1767,8 +1768,10 @@
 #define GFX_ARG_FADE_DELAY		39
 #define GFX_ARG_POST_DELAY		40
 #define GFX_ARG_AUTO_DELAY		41
+#define GFX_ARG_ALIGN			42
+#define GFX_ARG_SORT_PRIORITY		43
 
-#define NUM_GFX_ARGS			42
+#define NUM_GFX_ARGS			44
 
 
 /* values for sound configuration suffixes */
@@ -1963,7 +1966,7 @@
 
 struct BorderInfo
 {
-  int draw_masked[NUM_SPECIAL_GFX_ARGS];
+  boolean draw_masked[NUM_SPECIAL_GFX_ARGS];
 };
 
 #if 0
@@ -1992,23 +1995,23 @@ struct MenuMainButtonInfo
 
 struct MenuMainTextInfo
 {
-  struct MenuPosInfo name;
-  struct MenuPosInfo levels;
-  struct MenuPosInfo scores;
-  struct MenuPosInfo editor;
-  struct MenuPosInfo info;
-  struct MenuPosInfo game;
-  struct MenuPosInfo setup;
-  struct MenuPosInfo quit;
-
-  struct MenuPosInfo current_level;
-  struct MenuPosInfo first_level;
-  struct MenuPosInfo last_level;
-  struct MenuPosInfo level_info_1;
-  struct MenuPosInfo level_info_2;
-  struct MenuPosInfo title_1;
-  struct MenuPosInfo title_2;
-  struct MenuPosInfo title_3;
+  struct TextPosInfo name;
+  struct TextPosInfo levels;
+  struct TextPosInfo scores;
+  struct TextPosInfo editor;
+  struct TextPosInfo info;
+  struct TextPosInfo game;
+  struct TextPosInfo setup;
+  struct TextPosInfo quit;
+
+  struct TextPosInfo current_level;
+  struct TextPosInfo first_level;
+  struct TextPosInfo last_level;
+  struct TextPosInfo level_info_1;
+  struct TextPosInfo level_info_2;
+  struct TextPosInfo title_1;
+  struct TextPosInfo title_2;
+  struct TextPosInfo title_3;
 };
 
 struct MenuMainInputInfo
@@ -2034,6 +2037,21 @@ struct TitleInfo
   int auto_delay_final;
 };
 
+struct TitleMessageInfo
+{
+  int x;
+  int y;
+  int width;
+  int height;
+  int chars;
+  int lines;
+  int align;
+  boolean autowrap;
+  boolean centered;
+  boolean skip_comments;
+  int sort_priority;
+};
+
 struct MenuInfo
 {
   int draw_xoffset[NUM_SPECIAL_GFX_ARGS];
@@ -2092,6 +2110,9 @@ struct EnvelopeInfo
   int xsize;
   int ysize;
 
+  boolean autowrap;
+  boolean centered;
+
   char text[MAX_ENVELOPE_TEXT_LEN + 1];
 };
 
@@ -2480,6 +2501,8 @@ struct GraphicInfo
   int fade_delay;		/* optional setting for drawing title screens */
   int post_delay;		/* optional setting for drawing title screens */
   int auto_delay;		/* optional setting for drawing title screens */
+  int align;			/* optional setting for drawing title screens */
+  int sort_priority;		/* optional setting for drawing title screens */
 
   boolean use_image_size;	/* use image size as default width and height */
 
@@ -2559,7 +2582,6 @@ struct HelpAnimInfo
 
 extern Bitmap		       *bitmap_db_cross;
 extern Bitmap		       *bitmap_db_field;
-extern Bitmap		       *bitmap_db_field2;
 extern Bitmap		       *bitmap_db_panel;
 extern Bitmap		       *bitmap_db_door;
 extern Pixmap			tile_clipmask[];
@@ -2644,6 +2666,7 @@ extern struct TapeInfo		tape;
 extern struct GlobalInfo	global;
 extern struct BorderInfo	border;
 extern struct TitleInfo		title;
+extern struct TitleMessageInfo	titlemessage[], titlemessage_initial[];
 extern struct MenuInfo		menu;
 extern struct DoorInfo		door_1, door_2;
 extern struct PreviewInfo	preview;