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

diff --git a/src/libgame/system.h b/src/libgame/system.h
index f2ac0c1d..2f7c2bf6 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)
@@ -1541,7 +1535,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 +1648,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;