rnd-20070307-1-src

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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 314e07f3fa399654c293c308d19db48489600aab..b3811e61e6fcdbdd82d23ba0094b9dad7ba792b4 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_MENU_XPOS(p)   ALIGNED_XPOS((p)->x, (p)->width, (p)->align)
+#define ALIGNED_MENU_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 */
@@ -726,7 +729,7 @@ struct SetupEditorInfo
   boolean el_diamond_caves;
   boolean el_dx_boulderdash;
   boolean el_chars;
-  boolean el_steelchars;
+  boolean el_steel_chars;
   boolean el_custom;
   boolean el_user_defined;
   boolean el_dynamic;
@@ -750,7 +753,7 @@ struct SetupEditorCascadeInfo
   boolean el_dc;
   boolean el_dx;
   boolean el_chars;
-  boolean el_steelchars;
+  boolean el_steel_chars;
   boolean el_ce;
   boolean el_ge;
   boolean el_ref;
@@ -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;
@@ -1008,6 +1013,23 @@ struct Rect
   int width, height;
 };
 
+#if 1
+struct MenuPosInfo
+{
+  int x, y;
+  int width, height;
+  int align;
+};
+
+struct TextPosInfo
+{
+  int x, y;
+  int width, height;
+  int align;
+  int chars;
+};
+#endif
+
 
 /* ========================================================================= */
 /* exported variables                                                        */