SaveScoreToFilename(filename);
}
-static void ExecuteAsThread(SDL_ThreadFunction function, char *name, int data,
+static void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
char *error)
{
- static int data_static;
-
- data_static = data;
-
- SDL_Thread *thread = SDL_CreateThread(function, name, &data_static);
+ SDL_Thread *thread = SDL_CreateThread(function, name, data);
if (thread != NULL)
SDL_DetachThread(thread);
snprintf(request->body, MAX_HTTP_BODY_SIZE,
"{\n"
" \"levelset_identifier\": \"%s\",\n"
- " \"level_nr\": \"%d\",\n"
- " \"rate_time_over_score\": \"%d\"\n"
+ " \"level_nr\": \"%d\"\n"
"}\n",
- levelset.identifier, nr, level.rate_time_over_score);
+ levelset.identifier, nr);
+
+ ConvertHttpRequestBodyToServerEncoding(request);
if (!DoHttpRequest(request, response))
{
checked_free(response);
}
-static int DownloadServerScoreToCacheThread(void *data)
+struct DownloadServerScoreToCacheThreadData
{
- DownloadServerScoreToCache(*(int *)data);
+ int level_nr;
+};
+
+static int DownloadServerScoreToCacheThread(void *data_raw)
+{
+ struct DownloadServerScoreToCacheThreadData *data = data_raw;
+
+ DownloadServerScoreToCache(data->level_nr);
return 0;
}
static void DownloadServerScoreToCacheAsThread(int nr)
{
+ static struct DownloadServerScoreToCacheThreadData data;
+
+ data.level_nr = nr;
+
ExecuteAsThread(DownloadServerScoreToCacheThread,
- "DownloadServerScoreToCache", nr,
+ "DownloadServerScoreToCache", &data,
"download scores from server");
}
if (stat(filename, &file_status) != 0)
{
- Error("cannot stat file '%s'\n", filename);
+ Error("cannot stat file '%s'", filename);
return NULL;
}
if (!(file = fopen(filename, MODE_READ)))
{
- Error("cannot open file '%s'\n", filename);
+ Error("cannot open file '%s'", filename);
checked_free(buffer);
if (c == EOF)
{
- Error("cannot read from input file '%s'\n", filename);
+ Error("cannot read from input file '%s'", filename);
fclose(file);
checked_free(buffer);
return;
}
+ 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);
+
snprintf(request->body, MAX_HTTP_BODY_SIZE,
"{\n"
" \"game_version\": \"%s\",\n"
" \"levelset_num_levels\": \"%d\",\n"
" \"levelset_first_level\": \"%d\",\n"
" \"level_nr\": \"%d\",\n"
+ " \"level_name\": \"%s\",\n"
+ " \"level_author\": \"%s\",\n"
+ " \"rate_time_over_score\": \"%d\",\n"
" \"player_name\": \"%s\",\n"
" \"score\": \"%d\",\n"
" \"time\": \"%d\",\n"
" \"tape\": \"%s\"\n"
"}\n",
getProgramRealVersionString(),
- leveldir_current->identifier,
- leveldir_current->name,
- leveldir_current->author,
+ levelset_identifier,
+ levelset_name,
+ levelset_author,
leveldir_current->levels,
leveldir_current->first_level,
- level_nr,
- score_entry->name,
+ nr,
+ level_name,
+ level_author,
+ level.rate_time_over_score,
+ player_name,
score_entry->score,
score_entry->time,
score_entry->tape_basename,
checked_free(tape_base64);
+ checked_free(levelset_identifier);
+ checked_free(levelset_name);
+ checked_free(levelset_author);
+ checked_free(level_name);
+ checked_free(level_author);
+ checked_free(player_name);
+
ConvertHttpRequestBodyToServerEncoding(request);
if (!DoHttpRequest(request, response))
checked_free(response);
}
-static int UploadScoreToServerThread(void *data)
+struct UploadScoreToServerThreadData
{
- UploadScoreToServer(*(int *)data);
+ int level_nr;
+};
+
+static int UploadScoreToServerThread(void *data_raw)
+{
+ struct UploadScoreToServerThreadData *data = data_raw;
+
+ UploadScoreToServer(data->level_nr);
return 0;
}
static void UploadScoreToServerAsThread(int nr)
{
+ static struct UploadScoreToServerThreadData data;
+
+ data.level_nr = nr;
+
ExecuteAsThread(UploadScoreToServerThread,
- "UploadScoreToServer", nr,
+ "UploadScoreToServer", &data,
"upload score to server");
}