X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=ffb8f185c41ff7bca179531e9c95b6fc3706c64e;hp=f2ac0c1d73dd976f0f54227521917dde7b59699b;hb=f11d2545f41637e871283f7624dccc8243d05138;hpb=12a8fd3a64d6bee5ca5f5b89e4a00b49d78bbd2c

diff --git a/src/libgame/system.h b/src/libgame/system.h
index f2ac0c1d..ffb8f185 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -65,22 +65,14 @@
 #define STR_SPECIAL_RENDERING_TARGET	"target_texture_only"
 #define STR_SPECIAL_RENDERING_DOUBLE	"stream_and_target_texture"
 
-#if defined(TARGET_SDL2)
 #define STR_SPECIAL_RENDERING_DEFAULT	STR_SPECIAL_RENDERING_DOUBLE
-#else
-#define STR_SPECIAL_RENDERING_DEFAULT	STR_SPECIAL_RENDERING_BITMAP
-#endif
 
 #define SPECIAL_RENDERING_OFF		0
 #define SPECIAL_RENDERING_BITMAP	1
 #define SPECIAL_RENDERING_TARGET	2
 #define SPECIAL_RENDERING_DOUBLE	3
 
-#if defined(TARGET_SDL2)
 #define SPECIAL_RENDERING_DEFAULT	SPECIAL_RENDERING_DOUBLE
-#else
-#define SPECIAL_RENDERING_DEFAULT	SPECIAL_RENDERING_BITMAP
-#endif
 
 // values for vertical screen retrace synchronization (vsync)
 #define STR_VSYNC_MODE_OFF		"off"
@@ -421,6 +413,8 @@
 				 (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)
+#define ALIGNED_VP_XPOS(p)	ALIGNED_TEXT_XPOS(p)
+#define ALIGNED_VP_YPOS(p)	ALIGNED_TEXT_YPOS(p)
 
 // values for redraw_mask
 #define REDRAW_NONE		(0)
@@ -717,6 +711,7 @@
 #define TREE_TYPE_LEVEL_DIR	3
 #define TREE_TYPE_LEVEL_NR	4
 
+#define NUM_BASE_TREE_TYPES	4
 #define NUM_TREE_TYPES		5
 
 #define INFOTEXT_UNDEFINED	""
@@ -738,6 +733,16 @@
 				 INFOTEXT_MUSIC_DIR :			\
 				 INFOTEXT_UNDEFINED)
 
+#define TREE_USERDIR(t)		((t) == TREE_TYPE_LEVEL_DIR ?		\
+				 getUserLevelDir(NULL) :		\
+				 (t) == TREE_TYPE_GRAPHICS_DIR ?	\
+				 getUserGraphicsDir() :			\
+				 (t) == TREE_TYPE_SOUNDS_DIR ?		\
+				 getUserSoundsDir() :			\
+				 (t) == TREE_TYPE_MUSIC_DIR ?		\
+				 getUserMusicDir() :			\
+				 NULL)
+
 // values for artwork handling
 #define LEVELDIR_ARTWORK_SET_PTR(leveldir, type)			\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
@@ -1541,7 +1546,19 @@ struct RectWithBorder
 {
   int x, y;
   int width, height;
+  int min_width, min_height;
+  int max_width, max_height;
+  int margin_left;
+  int margin_right;
+  int margin_top;
+  int margin_bottom;
+  int border_left;
+  int border_right;
+  int border_top;
+  int border_bottom;
   int border_size;
+  int align_size;
+  int align, valign;
 };
 
 struct MenuPosInfo
@@ -1642,9 +1659,7 @@ extern DrawBuffer	       *drawto;
 extern int			button_status;
 extern boolean			motion_status;
 extern int			wheel_steps;
-#if defined(TARGET_SDL2)
 extern boolean			keyrepeat_status;
-#endif
 
 extern int			redraw_mask;
 
@@ -1690,6 +1705,7 @@ void SetTileCursorSXSY(int, int);
 void SetOverlayEnabled(boolean);
 void SetOverlayActive(boolean);
 void SetOverlayShowGrid(boolean);
+boolean GetOverlayEnabled(void);
 boolean GetOverlayActive(void);
 void SetDrawDeactivationMask(int);
 int GetDrawDeactivationMask(void);