snprintf(request->body, MAX_HTTP_BODY_SIZE,
"{\n"
"%s"
+ " \"game_version\": \"%s\",\n"
" \"levelset_identifier\": \"%s\",\n"
" \"level_nr\": \"%d\"\n"
"}\n",
getPasswordJSON(setup.api_server_password),
+ getProgramRealVersionString(),
levelset.identifier, level_nr);
ConvertHttpRequestBodyToServerEncoding(request);
void LoadServerScore(int nr, boolean download_score)
{
- if (!setup.api_server)
+ if (!setup.use_api_server)
return;
// always start with reliable default values
// (this should prevent reading it while the thread is writing to it)
LoadServerScoreFromCache(nr);
- if (download_score && runtime.api_server)
+ if (download_score && runtime.use_api_server)
{
// 2nd step: download server scores from score server to cache file
// (as thread, as it might time out if the server is not reachable)
return;
}
+ char *player_name_raw = score_entry->name;
+ char *player_uuid_raw = setup.player_uuid;
+
+ if (options.player_name != NULL)
+ {
+ player_name_raw = options.player_name;
+ player_uuid_raw = "";
+ }
+
char *levelset_identifier = getEscapedJSON(leveldir_current->identifier);
char *levelset_name = getEscapedJSON(leveldir_current->name);
char *levelset_author = getEscapedJSON(leveldir_current->author);
char *level_name = getEscapedJSON(level.name);
char *level_author = getEscapedJSON(level.author);
- char *player_name = getEscapedJSON(score_entry->name);
- char *player_uuid = getEscapedJSON(setup.player_uuid);
+ char *player_name = getEscapedJSON(player_name_raw);
+ char *player_uuid = getEscapedJSON(player_uuid_raw);
snprintf(request->body, MAX_HTTP_BODY_SIZE,
"{\n"
void SaveServerScore(int nr)
{
- if (!runtime.api_server)
+ if (!runtime.use_api_server)
return;
UploadScoreToServerAsThread(nr, NULL);
void SaveServerScoreFromFile(int nr, char *score_tape_filename)
{
- if (!runtime.api_server)
+ if (!runtime.use_api_server)
return;
UploadScoreToServerAsThread(nr, score_tape_filename);
// restore last added local score entry (before merging server scores)
scores.last_added = scores.last_added_local = last_added_local;
- if (setup.api_server && !setup.only_show_local_scores)
+ if (setup.use_api_server && !setup.only_show_local_scores)
{
// load server scores from cache file and trigger update from server
LoadServerScore(nr, download_score);
},
{
TYPE_SWITCH,
- &setup.api_server, "api_server"
+ &setup.use_api_server, "use_api_server"
},
{
TYPE_STRING,
TYPE_STRING,
&setup.api_server_password, "api_server_password"
},
+ {
+ TYPE_SWITCH,
+ &setup.ask_for_uploading_tapes, "ask_for_uploading_tapes"
+ },
+ {
+ TYPE_SWITCH,
+ &setup.provide_uploading_tapes, "provide_uploading_tapes"
+ },
{
TYPE_STRING,
&setup.touch.control_type, "touch.control_type"
si->network_player_nr = 0; // first player
si->network_server_hostname = getStringCopy(STR_NETWORK_AUTO_DETECT);
- si->api_server = TRUE;
+ si->use_api_server = TRUE;
si->api_server_hostname = getStringCopy(API_SERVER_HOSTNAME);
si->api_server_password = getStringCopy(UNDEFINED_PASSWORD);
+ si->ask_for_uploading_tapes = TRUE;
+ si->provide_uploading_tapes = TRUE;
si->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT);
si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT; // percent
global_setup_tokens[i].value == &setup.graphics_set ||
global_setup_tokens[i].value == &setup.volume_simple ||
global_setup_tokens[i].value == &setup.network_mode ||
- global_setup_tokens[i].value == &setup.api_server ||
+ global_setup_tokens[i].value == &setup.use_api_server ||
global_setup_tokens[i].value == &setup.touch.control_type ||
global_setup_tokens[i].value == &setup.touch.grid_xsize[0] ||
global_setup_tokens[i].value == &setup.touch.grid_xsize[1])