X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=2011aaacf3e6932985f32011b946555c7199b8e2;hb=3af17f639646cda1382de0d43075238e750b7ec6;hp=221d1eefd0a2e190a554b31c313a6abed15c1b29;hpb=544783044dc509bba661c1bf4a9d7fa64877d8cf;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 221d1eef..2011aaac 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
 // ============================================================================
@@ -65,15 +65,17 @@
 #define STR_SPECIAL_RENDERING_TARGET	"target_texture_only"
 #define STR_SPECIAL_RENDERING_DOUBLE	"stream_and_target_texture"
 
+#if defined(PLATFORM_EMSCRIPTEN)
+#define STR_SPECIAL_RENDERING_DEFAULT	STR_SPECIAL_RENDERING_BITMAP
+#else
 #define STR_SPECIAL_RENDERING_DEFAULT	STR_SPECIAL_RENDERING_DOUBLE
+#endif
 
 #define SPECIAL_RENDERING_OFF		0
 #define SPECIAL_RENDERING_BITMAP	1
 #define SPECIAL_RENDERING_TARGET	2
 #define SPECIAL_RENDERING_DOUBLE	3
 
-#define SPECIAL_RENDERING_DEFAULT	SPECIAL_RENDERING_DOUBLE
-
 // values for vertical screen retrace synchronization (vsync)
 #define STR_VSYNC_MODE_OFF		"off"
 #define STR_VSYNC_MODE_NORMAL		"normal"
@@ -87,6 +89,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)"
@@ -498,6 +510,9 @@
 // maximum number of parallel players supported by libgame functions
 #define MAX_PLAYERS		4
 
+// maximum number of player names
+#define MAX_PLAYER_NAMES	10
+
 // maximum allowed length of player name
 #define MAX_PLAYER_NAME_LEN	10
 
@@ -615,6 +630,7 @@
 #define CACHE_DIRECTORY		"cache"
 #define CONF_DIRECTORY		"conf"
 #define NETWORK_DIRECTORY	"network"
+#define USERS_DIRECTORY		"users"
 
 #define GFX_CLASSIC_SUBDIR	"gfx_classic"
 #define SND_CLASSIC_SUBDIR	"snd_classic"
@@ -633,6 +649,7 @@
 // file names and filename extensions
 #define LEVELSETUP_DIRECTORY	"levelsetup"
 #define SETUP_FILENAME		"setup.conf"
+#define USERSETUP_FILENAME	"usersetup.conf"
 #define AUTOSETUP_FILENAME	"autosetup.conf"
 #define LEVELSETUP_FILENAME	"levelsetup.conf"
 #define EDITORSETUP_FILENAME	"editorsetup.conf"
@@ -854,6 +871,20 @@
 				 (artwork).snd_first :			\
 				 (artwork).mus_first)
 
+#define ARTWORK_CURRENT_PTR(artwork, type)				\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 &(artwork).gfx_current :		\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 &(artwork).snd_current :		\
+				 &(artwork).mus_current)
+
+#define ARTWORK_CURRENT(artwork, type)					\
+				((type) == ARTWORK_TYPE_GRAPHICS ?	\
+				 (artwork).gfx_current :		\
+				 (type) == ARTWORK_TYPE_SOUNDS ?	\
+				 (artwork).snd_current :		\
+				 (artwork).mus_current)
+
 #define ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type)			\
 				((type) == ARTWORK_TYPE_GRAPHICS ?	\
 				 &(artwork).gfx_current_identifier :	\
@@ -967,6 +998,8 @@ struct NetworkInfo
   char *server_host;
   int server_port;
 
+  SDL_Thread *server_thread;
+  boolean is_server_thread;
 };
 
 struct RuntimeInfo
@@ -991,6 +1024,7 @@ struct OptionInfo
   char *execute_command;
 
   char *special_flags;
+  char *debug_mode;
 
   boolean mytapes;
   boolean serveronly;
@@ -1146,6 +1180,8 @@ struct TileCursorInfo
   int target_x, target_y;	// tile cursor target screen position
 
   int sx, sy;			// tile cursor screen start position
+
+  boolean xsn_debug;		// enable or disable XSN debugging
 };
 
 struct OverlayInfo
@@ -1296,6 +1332,7 @@ struct SetupShortcutInfo
 
 struct SetupSystemInfo
 {
+  char *sdl_renderdriver;
   char *sdl_videodriver;
   char *sdl_audiodriver;
   int audio_fragment_size;
@@ -1350,12 +1387,16 @@ struct SetupDebugInfo
   boolean frame_delay_use_mod_key;
   boolean frame_delay_game_only;
   boolean show_frames_per_second;
+  int xsn_mode;
+  int xsn_percent;
 };
 
 struct SetupInfo
 {
   char *player_name;
 
+  boolean multiple_users;
+
   boolean sound;
   boolean sound_loops;
   boolean sound_music;
@@ -1423,6 +1464,11 @@ struct SetupInfo
   struct OptionInfo options;
 };
 
+struct UserInfo
+{
+  int nr;
+};
+
 struct TreeInfo
 {
   struct TreeInfo **node_top;		// topmost node in tree
@@ -1743,6 +1789,7 @@ extern struct AnimInfo		anim;
 extern struct ArtworkInfo	artwork;
 extern struct JoystickInfo	joystick;
 extern struct SetupInfo		setup;
+extern struct UserInfo		user;
 
 extern LevelDirTree	       *leveldir_first_all;
 extern LevelDirTree	       *leveldir_first;
@@ -1760,6 +1807,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;
 
@@ -1798,6 +1846,7 @@ void InitGfxCustomArtworkInfo(void);
 void InitGfxOtherSettings(void);
 void InitTileCursorInfo(void);
 void InitOverlayInfo(void);
+void SetOverlayGridSizeAndButtons(void);
 void SetTileCursorEnabled(boolean);
 void SetTileCursorActive(boolean);
 void SetTileCursorTargetXY(int, int);