X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsystem.h;h=8ad5c08f8387b2cdc8e49f0187dfb9d46958ec8c;hb=7a8e465114815815796c2ebbe5f2e018a9265a3f;hp=77c6c367601a1d6b8e304e374be19cd8ef7fba04;hpb=9bbc42c66f07e770752e643c0ee4cacec95780d3;p=rocksndiamonds.git

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 77c6c367..8ad5c08f 100644
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -111,6 +111,15 @@
 #define API_SERVER_METHOD		"POST"
 #define API_SERVER_URI_ADD		"/api/scores/add"
 #define API_SERVER_URI_GET		"/api/scores/get"
+#define API_SERVER_URI_RENAME		"/api/players/rename"
+
+#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"
@@ -614,6 +623,9 @@
 // default value for undefined levelset
 #define UNDEFINED_LEVELSET	"[NONE]"
 
+// default value for undefined password
+#define UNDEFINED_PASSWORD	"[undefined]"
+
 // default value for undefined parameter
 #define ARG_DEFAULT		"[DEFAULT]"
 
@@ -624,18 +636,11 @@
 // default value for off-screen positions
 #define POS_OFFSCREEN		(-1000000)
 
-// definitions for game sub-directories
-#ifndef RO_GAME_DIR
-#define RO_GAME_DIR		"."
-#endif
-
-#ifndef RW_GAME_DIR
-#define RW_GAME_DIR		"."
+// definitions for game base path and sub-directories
+#ifndef BASE_PATH
+#define BASE_PATH		"."
 #endif
 
-#define RO_BASE_PATH		RO_GAME_DIR
-#define RW_BASE_PATH		RW_GAME_DIR
-
 // directory names
 #define GRAPHICS_DIRECTORY	"graphics"
 #define SOUNDS_DIRECTORY	"sounds"
@@ -669,6 +674,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"
@@ -679,6 +685,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"
@@ -1017,8 +1024,7 @@ struct ProgramInfo
   void (*exit_message_function)(char *, va_list);
   void (*exit_function)(int);
 
-  boolean global_scores;
-  boolean many_scores_per_name;
+  int api_thread_count;
 
   boolean headless;
 };
@@ -1040,7 +1046,7 @@ struct RuntimeInfo
 {
   boolean uses_touch_device;
 
-  boolean api_server;
+  boolean use_api_server;
 };
 
 struct OptionInfo
@@ -1048,8 +1054,7 @@ struct OptionInfo
   char *server_host;
   int server_port;
 
-  char *ro_base_directory;
-  char *rw_base_directory;
+  char *base_directory;
   char *level_directory;
   char *graphics_directory;
   char *sounds_directory;
@@ -1058,10 +1063,15 @@ struct OptionInfo
   char *conf_directory;
 
   char *execute_command;
+  char *tape_log_filename;
 
   char *special_flags;
   char *debug_mode;
 
+  char *player_name;
+  char *identifier;
+  char *level_nr;
+
   boolean mytapes;
   boolean serveronly;
   boolean network;
@@ -1437,6 +1447,7 @@ struct SetupDebugInfo
 struct SetupInfo
 {
   char *player_name;
+  char *player_uuid;
 
   boolean multiple_users;
 
@@ -1481,8 +1492,9 @@ struct SetupInfo
   int game_frame_delay;
   boolean sp_show_border_elements;
   boolean small_game_graphics;
-  boolean show_snapshot_buttons;
-  boolean only_show_local_scores;
+  boolean show_load_save_buttons;
+  boolean show_undo_redo_buttons;
+  char *scores_in_highscore_list;
 
   char *graphics_set;
   char *sounds_set;
@@ -1499,8 +1511,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;
@@ -1875,7 +1893,6 @@ void InitProgramInfo(char *, char *, char *, char *, char *, char *, char *,
 void InitNetworkInfo(boolean, boolean, boolean, char *, int);
 void InitRuntimeInfo(void);
 
-void InitScoresInfo(void);
 void SetWindowTitle(void);
 
 void InitWindowTitleFunction(char *(*window_title_function)(void));
@@ -1964,6 +1981,7 @@ Bitmap *LoadImage(char *);
 Bitmap *LoadCustomImage(char *);
 void ReloadCustomImage(Bitmap *, char *);
 
+Bitmap *ZoomBitmap(Bitmap *, int, int);
 void ReCreateGameTileSizeBitmap(Bitmap **);
 void CreateBitmapWithSmallBitmaps(Bitmap **, int, int);
 void CreateBitmapTextures(Bitmap **);