X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=44f97e073fa671c08a677b0b92648b2cdc9dccde;hb=9d23eac9de03f91cf0ac094786ab30cdd589ac49;hp=29f1c28ed708df72cee6c910c26f234762b67562;hpb=9151b056647ea2d66aa9836ac8051f58fd43bc2c;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 29f1c28e..44f97e07 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
@@ -966,6 +977,8 @@ struct NetworkInfo
   char *server_host;
   int server_port;
 
+  SDL_Thread *server_thread;
+  boolean is_server_thread;
 };
 
 struct RuntimeInfo
@@ -990,6 +1003,7 @@ struct OptionInfo
   char *execute_command;
 
   char *special_flags;
+  char *debug_mode;
 
   boolean mytapes;
   boolean serveronly;
@@ -1295,6 +1309,7 @@ struct SetupShortcutInfo
 
 struct SetupSystemInfo
 {
+  char *sdl_renderdriver;
   char *sdl_videodriver;
   char *sdl_audiodriver;
   int audio_fragment_size;
@@ -1759,6 +1774,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;