X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=331522ac7e398d2365c69513173a581c579211e7;hb=0868de4751d9e3d4b2f3185c52edb5569217d39a;hp=fcb2034b7a7f015fb62b58f444dca3329c948c82;hpb=b1f42b6eb7bfa63765e34366a2fd51ed9dd0be86;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index fcb2034b..331522ac 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -205,13 +205,19 @@
 #define ALIGN_LEFT		(1 << 0)
 #define ALIGN_RIGHT		(1 << 1)
 #define ALIGN_CENTER		(1 << 2)
-
 #define ALIGN_DEFAULT		ALIGN_LEFT
 
-#define ALIGNED_XPOS(x,w,a)	((a) == ALIGN_CENTER ? (x) - (w) / 2 :	\
-				 (a) == ALIGN_RIGHT  ? (x) - (w) : (x))
-#define ALIGNED_MENU_XPOS(p)	ALIGNED_XPOS((p)->x, (p)->width, (p)->align)
-#define ALIGNED_MENU_YPOS(p)	((p)->y)
+#define VALIGN_TOP		(1 << 0)
+#define VALIGN_BOTTOM		(1 << 1)
+#define VALIGN_MIDDLE		(1 << 2)
+#define VALIGN_DEFAULT		VALIGN_TOP
+
+#define ALIGNED_XPOS(x,w,a)	((a) == ALIGN_CENTER  ? (x) - (w) / 2 :	\
+				 (a) == ALIGN_RIGHT   ? (x) - (w) : (x))
+#define ALIGNED_YPOS(y,h,v)	((v) == VALIGN_MIDDLE ? (y) - (h) / 2 :	\
+				 (v) == VALIGN_BOTTOM ? (y) - (h) : (y))
+#define ALIGNED_TEXT_XPOS(p)	ALIGNED_XPOS((p)->x, (p)->width,  (p)->align)
+#define ALIGNED_TEXT_YPOS(p)	ALIGNED_YPOS((p)->y, (p)->height, (p)->valign)
 
 /* values for redraw_mask */
 #define REDRAW_NONE		(0)
@@ -251,7 +257,8 @@
 
 /* values for mouse cursor */
 #define CURSOR_DEFAULT		0
-#define CURSOR_PLAYFIELD	1
+#define CURSOR_NONE		1
+#define CURSOR_PLAYFIELD	2
 
 /* fundamental game speed values */
 #define ONE_SECOND_DELAY	1000	/* delay value for one second */
@@ -772,6 +779,7 @@ struct SetupShortcutInfo
 
 struct SetupSystemInfo
 {
+  char *sdl_videodriver;
   char *sdl_audiodriver;
   int audio_fragment_size;
 };
@@ -842,8 +850,10 @@ struct TreeInfo
   char *name;		/* tree info name, as displayed in selection menues */
   char *name_sorting;	/* optional sorting name for correct name sorting */
   char *author;		/* level or artwork author name */
+  char *year;		/* optional year of creation for levels or artwork */
   char *imported_from;	/* optional comment for imported levels or artwork */
   char *imported_by;	/* optional comment for imported levels or artwork */
+  char *tested_by;	/* optional comment to name people who tested a set */
 
   char *graphics_set_ecs; /* special EMC custom graphics set (ECS graphics) */
   char *graphics_set_aga; /* special EMC custom graphics set (AGA graphics) */
@@ -1011,22 +1021,21 @@ struct Rect
   int width, height;
 };
 
-#if 1
 struct MenuPosInfo
 {
   int x, y;
   int width, height;
-  int align;
+  int align, valign;
 };
 
 struct TextPosInfo
 {
   int x, y;
   int width, height;
-  int align;
+  int align, valign;
   int chars;
+  int font, font_alt;
 };
-#endif
 
 
 /* ========================================================================= */