SaveScoreToFilename(filename);
}
-static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
- char *error)
+void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
+ char *error)
{
SDL_Thread *thread = SDL_CreateThread(function, name, data);
Delay(1);
}
-static char *getPasswordJSON(char *password)
+char *getPasswordJSON(char *password)
{
static char password_json[MAX_FILENAME_LEN] = "";
static boolean initialized = FALSE;
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);
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_name = getEscapedJSON(player_name_raw);
+ char *player_uuid = getEscapedJSON(player_uuid_raw);
snprintf(request->body, MAX_HTTP_BODY_SIZE,
"{\n"
" \"level_author\": \"%s\",\n"
" \"rate_time_over_score\": \"%d\",\n"
" \"player_name\": \"%s\",\n"
+ " \"player_uuid\": \"%s\",\n"
" \"score\": \"%d\",\n"
" \"time\": \"%d\",\n"
" \"tape_basename\": \"%s\",\n"
level_author,
level.rate_time_over_score,
player_name,
+ player_uuid,
score_entry->score,
score_entry->time,
score_entry->tape_basename,
checked_free(level_name);
checked_free(level_author);
checked_free(player_name);
+ checked_free(player_uuid);
ConvertHttpRequestBodyToServerEncoding(request);
TYPE_STRING,
&setup.player_uuid, "player_uuid"
},
- {
- TYPE_STRING,
- &setup.system_uuid, "system_uuid"
- },
{
TYPE_SWITCH,
&setup.multiple_users, "multiple_users"
TYPE_STRING,
&setup.api_server_password, "api_server_password"
},
+ {
+ TYPE_SWITCH,
+ &setup.ask_for_uploading_tapes, "ask_for_uploading_tapes"
+ },
{
TYPE_STRING,
&setup.touch.control_type, "touch.control_type"
int i;
si->player_name = getStringCopy(getDefaultUserName(user.nr));
-
si->player_uuid = NULL; // (will be set later)
- si->system_uuid = NULL; // (will be set later)
si->multiple_users = TRUE;
si->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->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT);
si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT; // percent
setup.scroll_delay_value =
MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY);
- if (setup.player_uuid == NULL ||
- setup.system_uuid == NULL)
+ if (setup.player_uuid == NULL)
{
- if (setup.player_uuid == NULL)
- setup.player_uuid = getStringCopy(GetPlayerUUID());
-
- if (setup.system_uuid == NULL)
- setup.system_uuid = getStringCopy(GetSystemUUID());
+ // player UUID does not yet exist in setup file
+ setup.player_uuid = getStringCopy(getUUID());
SaveSetup();
}
-
- SetSystemUUID(setup.system_uuid);
}
void LoadSetup(void)
for (i = 0; i < ARRAY_SIZE(global_setup_tokens); i++)
{
// just to make things nicer :)
- if (global_setup_tokens[i].value == &setup.player_uuid ||
- global_setup_tokens[i].value == &setup.multiple_users ||
+ if (global_setup_tokens[i].value == &setup.multiple_users ||
global_setup_tokens[i].value == &setup.sound ||
global_setup_tokens[i].value == &setup.graphics_set ||
global_setup_tokens[i].value == &setup.volume_simple ||