rnd-20070315-1-src

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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 9d3e578ab55003c5a23a286161d75f538325aac1..6df8df049d31b2ddd092d2bf9885b6116031b572 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -210,6 +210,8 @@
 
 #define ALIGNED_XPOS(x,w,a)    ((a) == ALIGN_CENTER ? (x) - (w) / 2 :  \
                                 (a) == ALIGN_RIGHT  ? (x) - (w) : (x))
+#define ALIGNED_TEXT_XPOS(p)   ALIGNED_XPOS((p)->x, (p)->width, (p)->align)
+#define ALIGNED_TEXT_YPOS(p)   ((p)->y)
 
 /* values for redraw_mask */
 #define REDRAW_NONE            (0)
@@ -249,7 +251,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 */
@@ -770,6 +773,7 @@ struct SetupShortcutInfo
 
 struct SetupSystemInfo
 {
+  char *sdl_videodriver;
   char *sdl_audiodriver;
   int audio_fragment_size;
 };
@@ -802,6 +806,7 @@ struct SetupInfo
   boolean quick_switch;
   boolean input_on_focus;
   boolean prefer_aga_graphics;
+  int game_frame_delay;
 
   char *graphics_set;
   char *sounds_set;
@@ -839,8 +844,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) */
@@ -1008,7 +1015,6 @@ struct Rect
   int width, height;
 };
 
-#if 1
 struct MenuPosInfo
 {
   int x, y;
@@ -1022,8 +1028,8 @@ struct TextPosInfo
   int width, height;
   int align;
   int chars;
+  int font, font_alt;
 };
-#endif
 
 
 /* ========================================================================= */