X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=fa1c14f8cadc7491f6a6b1f53ee27c1cc5ba8da2;hb=721b2961c414daaa4ff380a8c1b83c2d65b00d79;hp=468473e3ab1d4312ba055cb2efbbad2fa4048124;hpb=a1058e2a13f1132331a123b735bdeb90cbc9af03;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 468473e3..fa1c14f8 100644
--- a/src/files.c
+++ b/src/files.c
@@ -9032,6 +9032,10 @@ void SaveScore(int nr)
 void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
 		     char *error)
 {
+#if defined(PLATFORM_EMSCRIPTEN)
+  // threads currently not fully supported by Emscripten/SDL and some browsers
+  function(data);
+#else
   SDL_Thread *thread = SDL_CreateThread(function, name, data);
 
   if (thread != NULL)
@@ -9041,6 +9045,7 @@ void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
 
   // nasty kludge to lower probability of intermingled thread error messages
   Delay(1);
+#endif
 }
 
 char *getPasswordJSON(char *password)
@@ -9063,11 +9068,40 @@ char *getPasswordJSON(char *password)
   return password_json;
 }
 
-static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
-					  struct HttpResponse *response,
-					  int level_nr,
-					  char *score_cache_filename)
+struct ApiGetScoreThreadData
+{
+  int level_nr;
+  char *score_cache_filename;
+};
+
+static void *CreateThreadData_ApiGetScore(int nr)
+{
+  struct ApiGetScoreThreadData *data =
+    checked_malloc(sizeof(struct ApiGetScoreThreadData));
+  char *score_cache_filename = getScoreCacheFilename(nr);
+
+  data->level_nr = nr;
+  data->score_cache_filename = getStringCopy(score_cache_filename);
+
+  return data;
+}
+
+static void FreeThreadData_ApiGetScore(void *data_raw)
 {
+  struct ApiGetScoreThreadData *data = data_raw;
+
+  checked_free(data->score_cache_filename);
+  checked_free(data);
+}
+
+static void ApiGetScore_HttpRequest(struct HttpRequest *request,
+				    struct HttpResponse *response,
+				    void *data_raw)
+{
+  struct ApiGetScoreThreadData *data = data_raw;
+  int level_nr = data->level_nr;
+  char *score_cache_filename = data->score_cache_filename;
+
   request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
   request->method   = API_SERVER_METHOD;
@@ -9077,11 +9111,13 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
 	   "{\n"
 	   "%s"
 	   "  \"game_version\":         \"%s\",\n"
+	   "  \"game_platform\":        \"%s\",\n"
 	   "  \"levelset_identifier\":  \"%s\",\n"
 	   "  \"level_nr\":             \"%d\"\n"
 	   "}\n",
 	   getPasswordJSON(setup.api_server_password),
 	   getProgramRealVersionString(),
+	   getProgramPlatformString(),
 	   levelset.identifier, level_nr);
 
   ConvertHttpRequestBodyToServerEncoding(request);
@@ -9135,48 +9171,27 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
   server_scores.updated = TRUE;
 }
 
-static void DownloadServerScoreToCache(int level_nr, char *score_cache_filename)
+static int ApiGetScoreThread(void *data_raw)
 {
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  DownloadServerScoreToCacheExt(request, response,
-				level_nr, score_cache_filename);
+  ApiGetScore_HttpRequest(request, response, data_raw);
+
+  FreeThreadData_ApiGetScore(data_raw);
 
   checked_free(request);
   checked_free(response);
-}
-
-struct DownloadServerScoreToCacheThreadData
-{
-  int level_nr;
-  char *score_cache_filename;
-};
-
-static int DownloadServerScoreToCacheThread(void *data_raw)
-{
-  struct DownloadServerScoreToCacheThreadData *data = data_raw;
-
-  DownloadServerScoreToCache(data->level_nr,
-			     data->score_cache_filename);
-
-  checked_free(data->score_cache_filename);
-  checked_free(data);
 
   return 0;
 }
 
-static void DownloadServerScoreToCacheAsThread(int nr)
+static void ApiGetScoreAsThread(int nr)
 {
-  struct DownloadServerScoreToCacheThreadData *data =
-    checked_malloc(sizeof(struct DownloadServerScoreToCacheThreadData));
-  char *score_cache_filename = getScoreCacheFilename(nr);
-
-  data->level_nr = nr;
-  data->score_cache_filename = getStringCopy(score_cache_filename);
+  struct ApiGetScoreThreadData *data = CreateThreadData_ApiGetScore(nr);
 
-  ExecuteAsThread(DownloadServerScoreToCacheThread,
-		  "DownloadServerScoreToCache", data,
+  ExecuteAsThread(ApiGetScoreThread,
+		  "ApiGetScore", data,
 		  "download scores from server");
 }
 
@@ -9262,7 +9277,7 @@ void LoadServerScore(int nr, boolean download_score)
   {
     // 2nd step: download server scores from score server to cache file
     // (as thread, as it might time out if the server is not reachable)
-    DownloadServerScoreToCacheAsThread(nr);
+    ApiGetScoreAsThread(nr);
   }
 }
 
@@ -9320,12 +9335,46 @@ static char *get_file_base64(char *filename)
   return buffer_encoded;
 }
 
-static void UploadScoreToServerExt(struct HttpRequest *request,
-				   struct HttpResponse *response,
-				   int level_nr,
-				   char *score_tape_filename,
-				   struct ScoreEntry *score_entry)
+struct ApiAddScoreThreadData
 {
+  int level_nr;
+  char *score_tape_filename;
+  struct ScoreEntry score_entry;
+};
+
+static void *CreateThreadData_ApiAddScore(int nr, char *score_tape_filename)
+{
+  struct ApiAddScoreThreadData *data =
+    checked_malloc(sizeof(struct ApiAddScoreThreadData));
+  struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
+
+  if (score_tape_filename == NULL)
+    score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
+
+  data->level_nr = nr;
+  data->score_entry = *score_entry;
+  data->score_tape_filename = getStringCopy(score_tape_filename);
+
+  return data;
+}
+
+static void FreeThreadData_ApiAddScore(void *data_raw)
+{
+  struct ApiAddScoreThreadData *data = data_raw;
+
+  checked_free(data->score_tape_filename);
+  checked_free(data);
+}
+
+static void ApiAddScore_HttpRequest(struct HttpRequest *request,
+				    struct HttpResponse *response,
+				    void *data_raw)
+{
+  struct ApiAddScoreThreadData *data = data_raw;
+  int level_nr = data->level_nr;
+  char *score_tape_filename = data->score_tape_filename;
+  struct ScoreEntry *score_entry = &data->score_entry;
+
   request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
   request->method   = API_SERVER_METHOD;
@@ -9361,6 +9410,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 	   "{\n"
 	   "%s"
 	   "  \"game_version\":         \"%s\",\n"
+	   "  \"game_platform\":        \"%s\",\n"
 	   "  \"batch_time\":           \"%d\",\n"
 	   "  \"levelset_identifier\":  \"%s\",\n"
 	   "  \"levelset_name\":        \"%s\",\n"
@@ -9380,6 +9430,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 	   "}\n",
 	   getPasswordJSON(setup.api_server_password),
 	   getProgramRealVersionString(),
+	   getProgramPlatformString(),
 	   (int)global.autoplay_time,
 	   levelset_identifier,
 	   levelset_name,
@@ -9428,55 +9479,28 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   server_scores.uploaded = TRUE;
 }
 
-static void UploadScoreToServer(int level_nr, char *score_tape_filename,
-				struct ScoreEntry *score_entry)
+static int ApiAddScoreThread(void *data_raw)
 {
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  UploadScoreToServerExt(request, response,
-			 level_nr, score_tape_filename, score_entry);
+  ApiAddScore_HttpRequest(request, response, data_raw);
+
+  FreeThreadData_ApiAddScore(data_raw);
 
   checked_free(request);
   checked_free(response);
-}
-
-struct UploadScoreToServerThreadData
-{
-  int level_nr;
-  char *score_tape_filename;
-  struct ScoreEntry score_entry;
-};
-
-static int UploadScoreToServerThread(void *data_raw)
-{
-  struct UploadScoreToServerThreadData *data = data_raw;
-
-  UploadScoreToServer(data->level_nr,
-		      data->score_tape_filename,
-		      &data->score_entry);
-
-  checked_free(data->score_tape_filename);
-  checked_free(data);
 
   return 0;
 }
 
-static void UploadScoreToServerAsThread(int nr, char *score_tape_filename)
+static void ApiAddScoreAsThread(int nr, char *score_tape_filename)
 {
-  struct UploadScoreToServerThreadData *data =
-    checked_malloc(sizeof(struct UploadScoreToServerThreadData));
-  struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
-
-  if (score_tape_filename == NULL)
-    score_tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
-
-  data->level_nr = nr;
-  data->score_entry = *score_entry;
-  data->score_tape_filename = getStringCopy(score_tape_filename);
+  struct ApiAddScoreThreadData *data =
+    CreateThreadData_ApiAddScore(nr, score_tape_filename);
 
-  ExecuteAsThread(UploadScoreToServerThread,
-		  "UploadScoreToServer", data,
+  ExecuteAsThread(ApiAddScoreThread,
+		  "ApiAddScore", data,
 		  "upload score to server");
 }
 
@@ -9485,7 +9509,7 @@ void SaveServerScore(int nr)
   if (!runtime.use_api_server)
     return;
 
-  UploadScoreToServerAsThread(nr, NULL);
+  ApiAddScoreAsThread(nr, NULL);
 }
 
 void SaveServerScoreFromFile(int nr, char *score_tape_filename)
@@ -9493,7 +9517,7 @@ void SaveServerScoreFromFile(int nr, char *score_tape_filename)
   if (!runtime.use_api_server)
     return;
 
-  UploadScoreToServerAsThread(nr, score_tape_filename);
+  ApiAddScoreAsThread(nr, score_tape_filename);
 }
 
 void LoadLocalAndServerScore(int nr, boolean download_score)