removed storing and sending system UUID again

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 8e51f5ad801cd1edd8bfe89bb42de8bc8d71dbcd..f486dba01745e9fc418ecd6bf29942b90145f159 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -9341,6 +9341,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   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);
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
@@ -9356,6 +9357,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           "  \"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"
@@ -9373,6 +9375,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
           level_author,
           level.rate_time_over_score,
           player_name,
+          player_uuid,
           score_entry->score,
           score_entry->time,
           score_entry->tape_basename,
@@ -9386,6 +9389,7 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
   checked_free(level_name);
   checked_free(level_author);
   checked_free(player_name);
+  checked_free(player_uuid);
 
   ConvertHttpRequestBodyToServerEncoding(request);
 
@@ -9513,10 +9517,6 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_STRING,
     &setup.player_uuid,                                "player_uuid"
   },
-  {
-    TYPE_STRING,
-    &setup.system_uuid,                                "system_uuid"
-  },
   {
     TYPE_SWITCH,
     &setup.multiple_users,                     "multiple_users"
@@ -10328,9 +10328,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   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;
 
@@ -10878,19 +10876,13 @@ static void LoadSetup_SpecialPostProcessing(void)
   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)
@@ -11023,8 +11015,7 @@ void SaveSetup(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            ||