X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=ad89c320722276631d38f4d766c5ef5e09c04812;hb=1e56877fb87c1004b98e6c5fbb1132da2178b46e;hp=013b729e4e2cd84d98b2c6be8030f1bb89f6813a;hpb=0321cbef506f76d246fda98882aa8ad21a48be27;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 013b729e..ad89c320 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -112,6 +112,15 @@
 #define API_SERVER_URI_ADD		"/api/scores/add"
 #define API_SERVER_URI_GET		"/api/scores/get"
 #define API_SERVER_URI_RENAME		"/api/players/rename"
+#define API_SERVER_URI_RESETUUID	"/api/players/resetuuid"
+
+#if defined(TESTING)
+#undef API_SERVER_HOSTNAME
+#define API_SERVER_HOSTNAME		"api-test.artsoft.org"
+#define TEST_PREFIX			"test."
+#else
+#define TEST_PREFIX			""
+#endif
 
 // values for touch control
 #define TOUCH_CONTROL_OFF		"off"
@@ -166,6 +175,8 @@
 // default shortcut keys
 #define DEFAULT_KEY_SAVE_GAME		KSYM_F1
 #define DEFAULT_KEY_LOAD_GAME		KSYM_F2
+#define DEFAULT_KEY_RESTART_GAME	KSYM_F3
+#define DEFAULT_KEY_PAUSE_BEFORE_END	KSYM_F4
 #define DEFAULT_KEY_TOGGLE_PAUSE	KSYM_space
 #define DEFAULT_KEY_FOCUS_PLAYER_1	KSYM_F5
 #define DEFAULT_KEY_FOCUS_PLAYER_2	KSYM_F6
@@ -360,6 +371,8 @@
 #define ANIM_STATIC_PANEL	(1 << 13)
 #define ANIM_ALL		(1 << 14)
 #define ANIM_ONCE		(1 << 15)
+#define ANIM_TILED		(1 << 16)
+#define ANIM_RANDOM_STATIC	(1 << 17)
 
 #define ANIM_DEFAULT		ANIM_LOOP
 
@@ -666,6 +679,7 @@
 #define USERSETUP_FILENAME	"usersetup.conf"
 #define AUTOSETUP_FILENAME	"autosetup.conf"
 #define LEVELSETUP_FILENAME	"levelsetup.conf"
+#define SERVERSETUP_FILENAME	"serversetup.conf"
 #define EDITORSETUP_FILENAME	"editorsetup.conf"
 #define EDITORCASCADE_FILENAME	"editorcascade.conf"
 #define HELPANIM_FILENAME	"helpanim.conf"
@@ -676,6 +690,7 @@
 #define MUSICINFO_FILENAME	"musicinfo.conf"
 #define ARTWORKINFO_CACHE_FILE	"artworkinfo.cache"
 #define LEVELTEMPLATE_FILENAME	"template.level"
+#define UPLOADED_FILENAME	".uploaded"
 #define LEVELFILE_EXTENSION	"level"
 #define TAPEFILE_EXTENSION	"tape"
 #define SCOREFILE_EXTENSION	"score"
@@ -1014,6 +1029,8 @@ struct ProgramInfo
   void (*exit_message_function)(char *, va_list);
   void (*exit_function)(int);
 
+  int api_thread_count;
+
   boolean headless;
 };
 
@@ -1034,7 +1051,7 @@ struct RuntimeInfo
 {
   boolean uses_touch_device;
 
-  boolean api_server;
+  boolean use_api_server;
 };
 
 struct OptionInfo
@@ -1056,6 +1073,10 @@ struct OptionInfo
   char *special_flags;
   char *debug_mode;
 
+  char *player_name;
+  char *identifier;
+  char *level_nr;
+
   boolean mytapes;
   boolean serveronly;
   boolean network;
@@ -1336,6 +1357,7 @@ struct SetupEditorCascadeInfo
   boolean el_steel_chars;
   boolean el_ce;
   boolean el_ge;
+  boolean el_es;
   boolean el_ref;
   boolean el_user;
   boolean el_dynamic;
@@ -1345,6 +1367,8 @@ struct SetupShortcutInfo
 {
   Key save_game;
   Key load_game;
+  Key restart_game;
+  Key pause_before_end;
   Key toggle_pause;
 
   Key focus_player[MAX_PLAYERS];
@@ -1432,6 +1456,7 @@ struct SetupInfo
 {
   char *player_name;
   char *player_uuid;
+  int player_version;
 
   boolean multiple_users;
 
@@ -1478,7 +1503,7 @@ struct SetupInfo
   boolean small_game_graphics;
   boolean show_load_save_buttons;
   boolean show_undo_redo_buttons;
-  boolean only_show_local_scores;
+  char *scores_in_highscore_list;
 
   char *graphics_set;
   char *sounds_set;
@@ -1495,9 +1520,14 @@ struct SetupInfo
   int network_player_nr;
   char *network_server_hostname;
 
-  boolean api_server;
+  boolean use_api_server;
   char *api_server_hostname;
   char *api_server_password;
+  boolean ask_for_uploading_tapes;
+  boolean ask_for_remaining_tapes;
+  boolean provide_uploading_tapes;
+  boolean ask_for_using_api_server;
+  boolean has_remaining_tapes;
 
   struct SetupAutoSetupInfo auto_setup;
   struct SetupLevelSetupInfo level_setup;