X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=d18f0f271df43dc9d20661cfbbd5201133d52f82;hb=1a41e7b2976c6486eb1412c55ed98c7fcc9f3e51;hp=185fdc5a1376c289d6eb3a2e4efe57fe05d1bd44;hpb=b2fbe97bd09c91e5efb580b35b910a3709015421;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 185fdc5a..d18f0f27 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -4,7 +4,7 @@
 // (c) 1995-2014 by Artsoft Entertainment
 //     		    Holger Schemel
 //		    info@artsoft.org
-//		    http://www.artsoft.org/
+//		    https://www.artsoft.org/
 // ----------------------------------------------------------------------------
 // system.h
 // ============================================================================
@@ -87,6 +87,16 @@
 
 #define VSYNC_MODE_DEFAULT		VSYNC_MODE_OFF
 
+#define VSYNC_MODE_STR_TO_INT(s)					\
+  (strEqual((s), STR_VSYNC_MODE_NORMAL)		? VSYNC_MODE_NORMAL :	\
+   strEqual((s), STR_VSYNC_MODE_ADAPTIVE)	? VSYNC_MODE_ADAPTIVE :	\
+   VSYNC_MODE_OFF)
+
+#define VSYNC_MODE_INT_TO_STR(i)					\
+  ((i) == VSYNC_MODE_NORMAL		? STR_VSYNC_MODE_NORMAL :	\
+   (i) == VSYNC_MODE_ADAPTIVE		? STR_VSYNC_MODE_ADAPTIVE :	\
+   STR_VSYNC_MODE_OFF)
+
 // values for network server settings
 #define STR_NETWORK_AUTO_DETECT		"auto_detect_network_server"
 #define STR_NETWORK_AUTO_DETECT_SETUP	"(auto detect network server)"
@@ -112,6 +122,7 @@
 
 // values for special settings for mobile devices
 #if defined(PLATFORM_ANDROID)
+#define HAS_TOUCH_DEVICE
 #define USE_TOUCH_INPUT_OVERLAY
 #define USE_COMPLETE_DISPLAY
 #define HAS_SCREEN_KEYBOARD
@@ -347,8 +358,9 @@
 #define STYLE_REVERSE		(1 << 2)
 
 // values for special event handling style (used for global animation)
-#define STYLE_PASSTHROUGH	(1 << 3)
-#define STYLE_MULTIPLE_ACTIONS	(1 << 4)
+#define STYLE_BLOCK		(1 << 3)
+#define STYLE_PASSTHROUGH	(1 << 4)
+#define STYLE_MULTIPLE_ACTIONS	(1 << 5)
 
 #define STYLE_DEFAULT		STYLE_NONE
 
@@ -989,6 +1001,7 @@ struct OptionInfo
   char *execute_command;
 
   char *special_flags;
+  char *debug_mode;
 
   boolean mytapes;
   boolean serveronly;
@@ -1294,6 +1307,7 @@ struct SetupShortcutInfo
 
 struct SetupSystemInfo
 {
+  char *sdl_renderdriver;
   char *sdl_videodriver;
   char *sdl_audiodriver;
   int audio_fragment_size;
@@ -1329,6 +1343,7 @@ struct SetupInternalInfo
   boolean create_user_levelset;
 
   boolean menu_game;
+  boolean menu_engines;
   boolean menu_editor;
   boolean menu_graphics;
   boolean menu_sound;
@@ -1359,7 +1374,8 @@ struct SetupInfo
   boolean sound_simple;
   boolean toons;
   boolean scroll_delay;
-  boolean scroll_delay_value;
+  boolean forced_scroll_delay;
+  int scroll_delay_value;
   char *engine_snapshot_mode;
   int engine_snapshot_memory;
   boolean fade_screens;
@@ -1384,6 +1400,7 @@ struct SetupInfo
   boolean quick_switch;
   boolean input_on_focus;
   boolean prefer_aga_graphics;
+  boolean prefer_lowpass_sounds;
   boolean game_speed_extended;
   int game_frame_delay;
   boolean sp_show_border_elements;
@@ -1452,6 +1469,8 @@ struct TreeInfo
   char *graphics_set_ecs; // special EMC custom graphics set (ECS graphics)
   char *graphics_set_aga; // special EMC custom graphics set (AGA graphics)
   char *graphics_set;	// optional custom graphics set (level tree only)
+  char *sounds_set_default; // default EMC custom sounds set
+  char *sounds_set_lowpass; // special EMC custom sounds set (lowpass filter)
   char *sounds_set;	// optional custom sounds set (level tree only)
   char *music_set;	// optional custom music set (level tree only)
   char *graphics_path;	// path to optional custom graphics set (level only)
@@ -1478,6 +1497,8 @@ struct TreeInfo
   boolean handicap;	// level set has no handicap when set to "false"
   boolean skip_levels;	// levels can be skipped when set to "true"
 
+  boolean use_emc_tiles;// use (swapped) V5/V6 EMC tiles when set to "true"
+
   int color;		// color to use on selection screen for this level
   char *class_desc;	// description of level series class
   int handicap_level;	// number of the lowest unsolved level
@@ -1751,6 +1772,7 @@ extern int			button_status;
 extern boolean			motion_status;
 extern int			wheel_steps;
 extern boolean			keyrepeat_status;
+extern boolean			textinput_status;
 
 extern int			redraw_mask;