projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added counting active API threads
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index 9d44373cf42c54cf0f4d036f98c843fe2b43aed5..11c88762ff96f9fbd2dd275050b57fd1bbe25d9d 100644
(file)
--- 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_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"
// 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 levelset
#define UNDEFINED_LEVELSET "[NONE]"
+// default value for undefined password
+#define UNDEFINED_PASSWORD "[undefined]"
+
// default value for undefined parameter
#define ARG_DEFAULT "[DEFAULT]"
// default value for undefined parameter
#define ARG_DEFAULT "[DEFAULT]"
@@
-624,18
+636,11
@@
// default value for off-screen positions
#define POS_OFFSCREEN (-1000000)
// 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
#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"
// 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 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"
#define EDITORSETUP_FILENAME "editorsetup.conf"
#define EDITORCASCADE_FILENAME "editorcascade.conf"
#define HELPANIM_FILENAME "helpanim.conf"
@@
-1017,6
+1023,8
@@
struct ProgramInfo
void (*exit_message_function)(char *, va_list);
void (*exit_function)(int);
void (*exit_message_function)(char *, va_list);
void (*exit_function)(int);
+ int api_thread_count;
+
boolean headless;
};
boolean headless;
};
@@
-1037,7
+1045,7
@@
struct RuntimeInfo
{
boolean uses_touch_device;
{
boolean uses_touch_device;
- boolean api_server;
+ boolean
use_
api_server;
};
struct OptionInfo
};
struct OptionInfo
@@
-1045,8
+1053,7
@@
struct OptionInfo
char *server_host;
int server_port;
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;
char *level_directory;
char *graphics_directory;
char *sounds_directory;
@@
-1055,10
+1062,15
@@
struct OptionInfo
char *conf_directory;
char *execute_command;
char *conf_directory;
char *execute_command;
+ char *tape_log_filename;
char *special_flags;
char *debug_mode;
char *special_flags;
char *debug_mode;
+ char *player_name;
+ char *identifier;
+ char *level_nr;
+
boolean mytapes;
boolean serveronly;
boolean network;
boolean mytapes;
boolean serveronly;
boolean network;
@@
-1434,6
+1446,7
@@
struct SetupDebugInfo
struct SetupInfo
{
char *player_name;
struct SetupInfo
{
char *player_name;
+ char *player_uuid;
boolean multiple_users;
boolean multiple_users;
@@
-1478,8
+1491,9
@@
struct SetupInfo
int game_frame_delay;
boolean sp_show_border_elements;
boolean small_game_graphics;
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;
char *graphics_set;
char *sounds_set;
@@
-1496,8
+1510,11
@@
struct SetupInfo
int network_player_nr;
char *network_server_hostname;
int network_player_nr;
char *network_server_hostname;
- boolean api_server;
+ boolean
use_
api_server;
char *api_server_hostname;
char *api_server_hostname;
+ char *api_server_password;
+ boolean ask_for_uploading_tapes;
+ boolean provide_uploading_tapes;
struct SetupAutoSetupInfo auto_setup;
struct SetupLevelSetupInfo level_setup;
struct SetupAutoSetupInfo auto_setup;
struct SetupLevelSetupInfo level_setup;
@@
-1960,6
+1977,7
@@
Bitmap *LoadImage(char *);
Bitmap *LoadCustomImage(char *);
void ReloadCustomImage(Bitmap *, char *);
Bitmap *LoadCustomImage(char *);
void ReloadCustomImage(Bitmap *, char *);
+Bitmap *ZoomBitmap(Bitmap *, int, int);
void ReCreateGameTileSizeBitmap(Bitmap **);
void CreateBitmapWithSmallBitmaps(Bitmap **, int, int);
void CreateBitmapTextures(Bitmap **);
void ReCreateGameTileSizeBitmap(Bitmap **);
void CreateBitmapWithSmallBitmaps(Bitmap **, int, int);
void CreateBitmapTextures(Bitmap **);