projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added additional empty space elements to level editor
[rocksndiamonds.git]
/
src
/
libgame
/
system.h
diff --git
a/src/libgame/system.h
b/src/libgame/system.h
index ed246f0d4baee50a94f724b3306001fc4568c04d..4acc61d8858bb4dc68ee26271bc2b0196d19b3b9 100644
(file)
--- 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_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"
// values for touch control
#define TOUCH_CONTROL_OFF "off"
@@
-360,6
+369,8
@@
#define ANIM_STATIC_PANEL (1 << 13)
#define ANIM_ALL (1 << 14)
#define ANIM_ONCE (1 << 15)
#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
#define ANIM_DEFAULT ANIM_LOOP
@@
-666,6
+677,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"
@@
-676,6
+688,7
@@
#define MUSICINFO_FILENAME "musicinfo.conf"
#define ARTWORKINFO_CACHE_FILE "artworkinfo.cache"
#define LEVELTEMPLATE_FILENAME "template.level"
#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"
#define LEVELFILE_EXTENSION "level"
#define TAPEFILE_EXTENSION "tape"
#define SCOREFILE_EXTENSION "score"
@@
-1014,6
+1027,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;
};
@@
-1034,7
+1049,7
@@
struct RuntimeInfo
{
boolean uses_touch_device;
{
boolean uses_touch_device;
- boolean api_server;
+ boolean
use_
api_server;
};
struct OptionInfo
};
struct OptionInfo
@@
-1057,6
+1072,8
@@
struct OptionInfo
char *debug_mode;
char *player_name;
char *debug_mode;
char *player_name;
+ char *identifier;
+ char *level_nr;
boolean mytapes;
boolean serveronly;
boolean mytapes;
boolean serveronly;
@@
-1338,6
+1355,7
@@
struct SetupEditorCascadeInfo
boolean el_steel_chars;
boolean el_ce;
boolean el_ge;
boolean el_steel_chars;
boolean el_ce;
boolean el_ge;
+ boolean el_es;
boolean el_ref;
boolean el_user;
boolean el_dynamic;
boolean el_ref;
boolean el_user;
boolean el_dynamic;
@@
-1434,6
+1452,7
@@
struct SetupInfo
{
char *player_name;
char *player_uuid;
{
char *player_name;
char *player_uuid;
+ int player_version;
boolean multiple_users;
boolean multiple_users;
@@
-1480,7
+1499,7
@@
struct SetupInfo
boolean small_game_graphics;
boolean show_load_save_buttons;
boolean show_undo_redo_buttons;
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;
char *graphics_set;
char *sounds_set;
@@
-1497,10
+1516,14
@@
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_password;
boolean ask_for_uploading_tapes;
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;
struct SetupAutoSetupInfo auto_setup;
struct SetupLevelSetupInfo level_setup;