added sending timestamp of batch tape uploads to score server
[rocksndiamonds.git] / src / files.c
index 83cbc05947dbb181f793d4b7c2610d3154541b61..c14d8396c8306ed4a44f43df3a526bab91feb35d 100644 (file)
@@ -327,6 +327,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(16),
     &li.finish_dig_collect,            TRUE
   },
+  {
+    EL_PLAYER_1,                       -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(17),
+    &li.keep_walkable_ce,              FALSE
+  },
 
   // (these values are different for each player)
   {
@@ -3155,7 +3160,7 @@ static int LoadLevel_MicroChunk(File *file, struct LevelFileConfigInfo *conf,
          value = getMappedElement(value);
 
        if (data_type == TYPE_BOOLEAN)
-         *(boolean *)(conf[i].value) = value;
+         *(boolean *)(conf[i].value) = (value ? TRUE : FALSE);
        else
          *(int *)    (conf[i].value) = value;
 
@@ -3637,7 +3642,7 @@ static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
   // initialize player positions and delete players from the playfield
   for (y = 0; y < cav->height; y++) for (x = 0; x < cav->width; x++)
   {
-    if (ELEM_IS_PLAYER(level->field[x][y]))
+    if (IS_PLAYER_ELEMENT(level->field[x][y]))
     {
       int player_nr = GET_PLAYER_NR(level->field[x][y]);
 
@@ -5890,6 +5895,21 @@ int getMappedElement_SB(int element_ascii, boolean use_ces)
   return EL_UNDEFINED;
 }
 
+static void SetLevelSettings_SB(struct LevelInfo *level)
+{
+  // time settings
+  level->time = 0;
+  level->use_step_counter = TRUE;
+
+  // score settings
+  level->score[SC_TIME_BONUS] = 0;
+  level->time_score_base = 1;
+  level->rate_time_over_score = TRUE;
+
+  // game settings
+  level->auto_exit_sokoban = TRUE;
+}
+
 static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
                                     struct LevelFileInfo *level_file_info,
                                     boolean level_info_only)
@@ -6123,14 +6143,11 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
   }
 
   // set special level settings for Sokoban levels
-
-  level->time = 0;
-  level->use_step_counter = TRUE;
+  SetLevelSettings_SB(level);
 
   if (load_xsb_to_ces)
   {
     // special global settings can now be set in level template
-
     level->use_custom_template = TRUE;
   }
 }
@@ -6463,6 +6480,34 @@ static void LoadLevel_InitVersion(struct LevelInfo *level)
   // CE actions were triggered by unfinished digging/collecting up to 4.2.2.0
   if (level->game_version <= VERSION_IDENT(4,2,2,0))
     level->finish_dig_collect = FALSE;
+
+  // CE changing to player was kept under the player if walkable up to 4.2.3.1
+  if (level->game_version <= VERSION_IDENT(4,2,3,1))
+    level->keep_walkable_ce = TRUE;
+}
+
+static void LoadLevel_InitSettings_SB(struct LevelInfo *level)
+{
+  boolean is_sokoban_level = TRUE;    // unless non-Sokoban elements found
+  int x, y;
+
+  // check if this level is (not) a Sokoban level
+  for (y = 0; y < level->fieldy; y++)
+    for (x = 0; x < level->fieldx; x++)
+      if (!IS_SB_ELEMENT(Tile[x][y]))
+       is_sokoban_level = FALSE;
+
+  if (is_sokoban_level)
+  {
+    // set special level settings for Sokoban levels
+    SetLevelSettings_SB(level);
+  }
+}
+
+static void LoadLevel_InitSettings(struct LevelInfo *level)
+{
+  // adjust level settings for (non-native) Sokoban-style levels
+  LoadLevel_InitSettings_SB(level);
 }
 
 static void LoadLevel_InitStandardElements(struct LevelInfo *level)
@@ -6691,6 +6736,7 @@ static void LoadLevelTemplate_LoadAndInit(void)
 
   LoadLevel_InitVersion(&level_template);
   LoadLevel_InitElements(&level_template);
+  LoadLevel_InitSettings(&level_template);
 
   ActivateLevelTemplate();
 }
@@ -6731,6 +6777,7 @@ static void LoadLevel_LoadAndInit(struct NetworkLevelInfo *network_level)
   LoadLevel_InitVersion(&level);
   LoadLevel_InitElements(&level);
   LoadLevel_InitPlayfield(&level);
+  LoadLevel_InitSettings(&level);
 
   LoadLevel_InitNativeEngines(&level);
 }
@@ -7656,10 +7703,33 @@ void DumpLevel(struct LevelInfo *level)
   Print("SP player blocks last field: %s\n", (level->sp_block_last_field ? "yes" : "no"));
   Print("use spring bug: %s\n", (level->use_spring_bug ? "yes" : "no"));
   Print("use step counter: %s\n", (level->use_step_counter ? "yes" : "no"));
+  Print("rate time over score: %s\n", (level->rate_time_over_score ? "yes" : "no"));
 
   PrintLine("-", 79);
 }
 
+void DumpLevels(void)
+{
+  static LevelDirTree *dumplevel_leveldir = NULL;
+
+  dumplevel_leveldir = getTreeInfoFromIdentifier(leveldir_first,
+                                                global.dumplevel_leveldir);
+
+  if (dumplevel_leveldir == NULL)
+    Fail("no such level identifier: '%s'", global.dumplevel_leveldir);
+
+  if (global.dumplevel_level_nr < dumplevel_leveldir->first_level ||
+      global.dumplevel_level_nr > dumplevel_leveldir->last_level)
+    Fail("no such level number: %d", global.dumplevel_level_nr);
+
+  leveldir_current = dumplevel_leveldir;
+
+  LoadLevel(global.dumplevel_level_nr);
+  DumpLevel(&level);
+
+  CloseAllAndExit(0);
+}
+
 
 // ============================================================================
 // tape file functions
@@ -8377,11 +8447,34 @@ void DumpTape(struct TapeInfo *tape)
   }
 
   PrintLine("-", 79);
+
   Print("Tape of Level %03d (file version %08d, game version %08d)\n",
        tape->level_nr, tape->file_version, tape->game_version);
   Print("                  (effective engine version %08d)\n",
        tape->engine_version);
   Print("Level series identifier: '%s'\n", tape->level_identifier);
+
+  Print("Special tape properties: ");
+  if (tape->property_bits == TAPE_PROPERTY_NONE)
+    Print("[none]");
+  if (tape->property_bits & TAPE_PROPERTY_EM_RANDOM_BUG)
+    Print("[em_random_bug]");
+  if (tape->property_bits & TAPE_PROPERTY_GAME_SPEED)
+    Print("[game_speed]");
+  if (tape->property_bits & TAPE_PROPERTY_PAUSE_MODE)
+    Print("[pause]");
+  if (tape->property_bits & TAPE_PROPERTY_SINGLE_STEP)
+    Print("[single_step]");
+  if (tape->property_bits & TAPE_PROPERTY_SNAPSHOT)
+    Print("[snapshot]");
+  if (tape->property_bits & TAPE_PROPERTY_REPLAYED)
+    Print("[replayed]");
+  if (tape->property_bits & TAPE_PROPERTY_TAS_KEYS)
+    Print("[tas_keys]");
+  if (tape->property_bits & TAPE_PROPERTY_SMALL_GRAPHICS)
+    Print("[small_graphics]");
+
+  Print("\n");
   PrintLine("-", 79);
 
   tape_frame_counter = 0;
@@ -8419,6 +8512,32 @@ void DumpTape(struct TapeInfo *tape)
   PrintLine("-", 79);
 }
 
+void DumpTapes(void)
+{
+  static LevelDirTree *dumptape_leveldir = NULL;
+
+  dumptape_leveldir = getTreeInfoFromIdentifier(leveldir_first,
+                                               global.dumptape_leveldir);
+
+  if (dumptape_leveldir == NULL)
+    Fail("no such level identifier: '%s'", global.dumptape_leveldir);
+
+  if (global.dumptape_level_nr < dumptape_leveldir->first_level ||
+      global.dumptape_level_nr > dumptape_leveldir->last_level)
+    Fail("no such level number: %d", global.dumptape_level_nr);
+
+  leveldir_current = dumptape_leveldir;
+
+  if (options.mytapes)
+    LoadTape(global.dumptape_level_nr);
+  else
+    LoadSolutionTape(global.dumptape_level_nr);
+
+  DumpTape(&tape);
+
+  CloseAllAndExit(0);
+}
+
 
 // ============================================================================
 // score file functions
@@ -8438,6 +8557,11 @@ static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
 
   scores->num_entries = 0;
   scores->last_added = -1;
+  scores->last_added_local = -1;
+
+  scores->updated = FALSE;
+  scores->uploaded = FALSE;
+  scores->force_last_added = FALSE;
 }
 
 static void setScoreInfoToDefaults(void)
@@ -8739,7 +8863,6 @@ void LoadScore(int nr)
 void SaveScore_OLD(int nr)
 {
   int i;
-  int permissions = (program.global_scores ? PERMS_PUBLIC : PERMS_PRIVATE);
   char *filename = getScoreFilename(nr);
   FILE *file;
 
@@ -8760,7 +8883,7 @@ void SaveScore_OLD(int nr)
 
   fclose(file);
 
-  SetFilePermissions(filename, permissions);
+  SetFilePermissions(filename, PERMS_PRIVATE);
 }
 #endif
 
@@ -8829,7 +8952,6 @@ static void SaveScore_TAPE(FILE *file, struct ScoreInfo *scores)
 static void SaveScoreToFilename(char *filename)
 {
   FILE *file;
-  int permissions = (program.global_scores ? PERMS_PUBLIC : PERMS_PRIVATE);
   int info_chunk_size;
   int name_chunk_size;
   int scor_chunk_size;
@@ -8872,7 +8994,7 @@ static void SaveScoreToFilename(char *filename)
 
   fclose(file);
 
-  SetFilePermissions(filename, permissions);
+  SetFilePermissions(filename, PERMS_PRIVATE);
 }
 
 void SaveScore(int nr)
@@ -8904,22 +9026,62 @@ void SaveScore(int nr)
   SaveScoreToFilename(filename);
 }
 
+void ExecuteAsThread(SDL_ThreadFunction function, char *name, void *data,
+                    char *error)
+{
+  SDL_Thread *thread = SDL_CreateThread(function, name, data);
+
+  if (thread != NULL)
+    SDL_DetachThread(thread);
+  else
+    Error("Cannot create thread to %s!", error);
+
+  // nasty kludge to lower probability of intermingled thread error messages
+  Delay(1);
+}
+
+char *getPasswordJSON(char *password)
+{
+  static char password_json[MAX_FILENAME_LEN] = "";
+  static boolean initialized = FALSE;
+
+  if (!initialized)
+  {
+    if (password != NULL &&
+       !strEqual(password, "") &&
+       !strEqual(password, UNDEFINED_PASSWORD))
+      snprintf(password_json, MAX_FILENAME_LEN,
+              "  \"password\":             \"%s\",\n",
+              setup.api_server_password);
+
+    initialized = TRUE;
+  }
+
+  return password_json;
+}
+
 static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
                                          struct HttpResponse *response,
-                                         int nr)
+                                         int level_nr,
+                                         char *score_cache_filename)
 {
-  request->hostname = API_SERVER_HOSTNAME;
+  request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
   request->method   = API_SERVER_METHOD;
   request->uri      = API_SERVER_URI_GET;
 
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
+          "%s"
+          "  \"game_version\":         \"%s\",\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);
+          getPasswordJSON(setup.api_server_password),
+          getProgramRealVersionString(),
+          levelset.identifier, level_nr);
+
+  ConvertHttpRequestBodyToServerEncoding(request);
 
   if (!DoHttpRequest(request, response))
   {
@@ -8946,7 +9108,7 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
 
   ConvertHttpResponseBodyToClientEncoding(response);
 
-  char *filename = getScoreCacheFilename(nr);
+  char *filename = score_cache_filename;
   FILE *file;
   int i;
 
@@ -8966,19 +9128,55 @@ static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
   fclose(file);
 
   SetFilePermissions(filename, PERMS_PRIVATE);
+
+  server_scores.updated = TRUE;
 }
 
-static void DownloadServerScoreToCache(int nr)
+static void DownloadServerScoreToCache(int level_nr, char *score_cache_filename)
 {
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  DownloadServerScoreToCacheExt(request, response, nr);
+  DownloadServerScoreToCacheExt(request, response,
+                               level_nr, score_cache_filename);
 
   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)
+{
+  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);
+
+  ExecuteAsThread(DownloadServerScoreToCacheThread,
+                 "DownloadServerScoreToCache", data,
+                 "download scores from server");
+}
+
 static void LoadServerScoreFromCache(int nr)
 {
   struct ScoreEntry score_entry;
@@ -9045,15 +9243,24 @@ static void LoadServerScoreFromCache(int nr)
   freeSetupFileHash(score_hash);
 }
 
-void LoadServerScore(int nr)
+void LoadServerScore(int nr, boolean download_score)
 {
+  if (!setup.use_api_server)
+    return;
+
   // always start with reliable default values
   setServerScoreInfoToDefaults();
 
-  DownloadServerScoreToCache(nr);
+  // 1st step: load server scores from cache file (which may not exist)
+  // (this should prevent reading it while the thread is writing to it)
   LoadServerScoreFromCache(nr);
 
-  MergeServerScore();
+  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)
+    DownloadServerScoreToCacheAsThread(nr);
+  }
 }
 
 static char *get_file_base64(char *filename)
@@ -9062,7 +9269,7 @@ static char *get_file_base64(char *filename)
 
   if (stat(filename, &file_status) != 0)
   {
-    Error("cannot stat file '%s'\n", filename);
+    Error("cannot stat file '%s'", filename);
 
     return NULL;
   }
@@ -9074,7 +9281,7 @@ static char *get_file_base64(char *filename)
 
   if (!(file = fopen(filename, MODE_READ)))
   {
-    Error("cannot open file '%s'\n", filename);
+    Error("cannot open file '%s'", filename);
 
     checked_free(buffer);
 
@@ -9087,7 +9294,7 @@ static char *get_file_base64(char *filename)
 
     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);
@@ -9112,17 +9319,16 @@ static char *get_file_base64(char *filename)
 
 static void UploadScoreToServerExt(struct HttpRequest *request,
                                   struct HttpResponse *response,
-                                  int nr)
+                                  int level_nr,
+                                  char *score_tape_filename,
+                                  struct ScoreEntry *score_entry)
 {
-  struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
-
-  request->hostname = API_SERVER_HOSTNAME;
+  request->hostname = setup.api_server_hostname;
   request->port     = API_SERVER_PORT;
   request->method   = API_SERVER_METHOD;
   request->uri      = API_SERVER_URI_ADD;
 
-  char *tape_filename = getScoreTapeFilename(score_entry->tape_basename, nr);
-  char *tape_base64 = get_file_base64(tape_filename);
+  char *tape_base64 = get_file_base64(score_tape_filename);
 
   if (tape_base64 == NULL)
   {
@@ -9131,34 +9337,73 @@ static void UploadScoreToServerExt(struct HttpRequest *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(player_name_raw);
+  char *player_uuid         = getEscapedJSON(player_uuid_raw);
+
   snprintf(request->body, MAX_HTTP_BODY_SIZE,
           "{\n"
+          "%s"
           "  \"game_version\":         \"%s\",\n"
+          "  \"batch_time\":           \"%d\",\n"
           "  \"levelset_identifier\":  \"%s\",\n"
           "  \"levelset_name\":        \"%s\",\n"
           "  \"levelset_author\":      \"%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"
+          "  \"player_uuid\":          \"%s\",\n"
           "  \"score\":                \"%d\",\n"
           "  \"time\":                 \"%d\",\n"
           "  \"tape_basename\":        \"%s\",\n"
           "  \"tape\":                 \"%s\"\n"
           "}\n",
+          getPasswordJSON(setup.api_server_password),
           getProgramRealVersionString(),
-          leveldir_current->identifier,
-          leveldir_current->name,
-          leveldir_current->author,
+          (int)global.autoplay_time,
+          levelset_identifier,
+          levelset_name,
+          levelset_author,
           leveldir_current->levels,
           leveldir_current->first_level,
           level_nr,
-          score_entry->name,
+          level_name,
+          level_author,
+          level.rate_time_over_score,
+          player_name,
+          player_uuid,
           score_entry->score,
           score_entry->time,
           score_entry->tape_basename,
           tape_base64);
 
+  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);
+  checked_free(player_uuid);
+
   ConvertHttpRequestBodyToServerEncoding(request);
 
   if (!DoHttpRequest(request, response))
@@ -9176,22 +9421,95 @@ static void UploadScoreToServerExt(struct HttpRequest *request,
 
     return;
   }
+
+  server_scores.uploaded = TRUE;
 }
 
-static void UploadScoreToServer(int nr)
+static void UploadScoreToServer(int level_nr, char *score_tape_filename,
+                               struct ScoreEntry *score_entry)
 {
   struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
   struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
 
-  UploadScoreToServerExt(request, response, nr);
+  UploadScoreToServerExt(request, response,
+                        level_nr, score_tape_filename, score_entry);
 
   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)
+{
+  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);
+
+  ExecuteAsThread(UploadScoreToServerThread,
+                 "UploadScoreToServer", data,
+                 "upload score to server");
+}
+
 void SaveServerScore(int nr)
 {
-  UploadScoreToServer(nr);
+  if (!runtime.use_api_server)
+    return;
+
+  UploadScoreToServerAsThread(nr, NULL);
+}
+
+void SaveServerScoreFromFile(int nr, char *score_tape_filename)
+{
+  if (!runtime.use_api_server)
+    return;
+
+  UploadScoreToServerAsThread(nr, score_tape_filename);
+}
+
+void LoadLocalAndServerScore(int nr, boolean download_score)
+{
+  int last_added_local = scores.last_added_local;
+
+  LoadScore(nr);
+
+  // restore last added local score entry (before merging server scores)
+  scores.last_added = scores.last_added_local = last_added_local;
+
+  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);
+
+    // merge local scores with scores from server
+    MergeServerScore();
+  }
 }
 
 
@@ -9208,6 +9526,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_STRING,
     &setup.player_name,                                "player_name"
   },
+  {
+    TYPE_STRING,
+    &setup.player_uuid,                                "player_uuid"
+  },
   {
     TYPE_SWITCH,
     &setup.multiple_users,                     "multiple_users"
@@ -9378,7 +9700,15 @@ static struct TokenInfo global_setup_tokens[] =
   },
   {
     TYPE_SWITCH,
-    &setup.show_snapshot_buttons,              "show_snapshot_buttons"
+    &setup.show_load_save_buttons,             "show_load_save_buttons"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.show_undo_redo_buttons,             "show_undo_redo_buttons"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.only_show_local_scores,             "only_show_local_scores"
   },
   {
     TYPE_STRING,
@@ -9428,6 +9758,26 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_STRING,
     &setup.network_server_hostname,            "network_server_hostname"
   },
+  {
+    TYPE_SWITCH,
+    &setup.use_api_server,                     "use_api_server"
+  },
+  {
+    TYPE_STRING,
+    &setup.api_server_hostname,                        "api_server_hostname"
+  },
+  {
+    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"
@@ -9999,6 +10349,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->multiple_users = TRUE;
 
@@ -10043,7 +10394,9 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->game_frame_delay = GAME_FRAME_DELAY;
   si->sp_show_border_elements = FALSE;
   si->small_game_graphics = FALSE;
-  si->show_snapshot_buttons = FALSE;
+  si->show_load_save_buttons = FALSE;
+  si->show_undo_redo_buttons = FALSE;
+  si->only_show_local_scores = FALSE;
 
   si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
   si->sounds_set   = getStringCopy(SND_CLASSIC_SUBDIR);
@@ -10061,6 +10414,12 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->network_player_nr = 0;           // first player
   si->network_server_hostname = getStringCopy(STR_NETWORK_AUTO_DETECT);
 
+  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
   si->touch.drop_distance = TOUCH_DROP_DISTANCE_DEFAULT;       // percent
@@ -10539,6 +10898,14 @@ static void LoadSetup_SpecialPostProcessing(void)
   // make sure that scroll delay value stays inside valid range
   setup.scroll_delay_value =
     MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY);
+
+  if (setup.player_uuid == NULL)
+  {
+    // player UUID does not yet exist in setup file
+    setup.player_uuid = getStringCopy(getUUID());
+
+    SaveSetup();
+  }
 }
 
 void LoadSetup(void)
@@ -10676,6 +11043,7 @@ void SaveSetup(void)
        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.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])
@@ -12860,6 +13228,11 @@ void ConvertLevels(void)
 
     Print("converting level ... ");
 
+#if 0
+    // special case: conversion of some EMC levels as requested by ACME
+    level.game_engine_type = GAME_ENGINE_TYPE_RND;
+#endif
+
     level_filename = getDefaultLevelFilename(level_nr);
     new_level = !fileExists(level_filename);
 
@@ -12937,8 +13310,8 @@ void CreateLevelSketchImages(void)
     sprintf(basename1, "%04d.bmp", i);
     sprintf(basename2, "%04ds.bmp", i);
 
-    filename1 = getPath2(global.create_images_dir, basename1);
-    filename2 = getPath2(global.create_images_dir, basename2);
+    filename1 = getPath2(global.create_sketch_images_dir, basename1);
+    filename2 = getPath2(global.create_sketch_images_dir, basename2);
 
     DrawSizedElement(0, 0, element, TILESIZE);
     BlitBitmap(drawto, bitmap1, SX, SY, TILEX, TILEY, 0, 0);
@@ -12982,6 +13355,104 @@ void CreateLevelSketchImages(void)
 }
 
 
+// ----------------------------------------------------------------------------
+// create and save images for element collecting animations (raw BMP format)
+// ----------------------------------------------------------------------------
+
+static boolean createCollectImage(int element)
+{
+  return (IS_COLLECTIBLE(element) && !IS_SP_ELEMENT(element));
+}
+
+void CreateCollectElementImages(void)
+{
+  int i, j;
+  int num_steps = 8;
+  int anim_frames = num_steps - 1;
+  int tile_size = TILESIZE;
+  int anim_width  = tile_size * anim_frames;
+  int anim_height = tile_size;
+  int num_collect_images = 0;
+  int pos_collect_images = 0;
+
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
+    if (createCollectImage(i))
+      num_collect_images++;
+
+  Info("Creating %d element collecting animation images ...",
+       num_collect_images);
+
+  int dst_width  = anim_width * 2;
+  int dst_height = anim_height * num_collect_images / 2;
+  Bitmap *dst_bitmap = CreateBitmap(dst_width, dst_height, DEFAULT_DEPTH);
+  char *basename = "RocksCollect.bmp";
+  char *filename = getPath2(global.create_collect_images_dir, basename);
+
+  for (i = 0; i < MAX_NUM_ELEMENTS; i++)
+  {
+    if (!createCollectImage(i))
+      continue;
+
+    int dst_x = (pos_collect_images / (num_collect_images / 2)) * anim_width;
+    int dst_y = (pos_collect_images % (num_collect_images / 2)) * anim_height;
+    int graphic = el2img(i);
+    char *token_name = element_info[i].token_name;
+    Bitmap *tmp_bitmap = CreateBitmap(tile_size, tile_size, DEFAULT_DEPTH);
+    Bitmap *src_bitmap;
+    int src_x, src_y;
+
+    Info("- creating collecting image for '%s' ...", token_name);
+
+    getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y);
+
+    BlitBitmap(src_bitmap, tmp_bitmap, src_x, src_y,
+              tile_size, tile_size, 0, 0);
+
+    tmp_bitmap->surface_masked = tmp_bitmap->surface;
+
+    for (j = 0; j < anim_frames; j++)
+    {
+      int frame_size_final = tile_size * (anim_frames - j) / num_steps;
+      int frame_size = frame_size_final * num_steps;
+      int offset = (tile_size - frame_size_final) / 2;
+      Bitmap *frame_bitmap = ZoomBitmap(tmp_bitmap, frame_size, frame_size);
+
+      while (frame_size > frame_size_final)
+      {
+       frame_size /= 2;
+
+       Bitmap *half_bitmap = ZoomBitmap(frame_bitmap, frame_size, frame_size);
+
+       FreeBitmap(frame_bitmap);
+
+       frame_bitmap = half_bitmap;
+      }
+
+      BlitBitmap(frame_bitmap, dst_bitmap, 0, 0,
+                frame_size_final, frame_size_final,
+                dst_x + j * tile_size + offset, dst_y + offset);
+
+      FreeBitmap(frame_bitmap);
+    }
+
+    tmp_bitmap->surface_masked = NULL;
+
+    FreeBitmap(tmp_bitmap);
+
+    pos_collect_images++;
+  }
+
+  if (SDL_SaveBMP(dst_bitmap->surface, filename) != 0)
+    Fail("cannot save element collecting image file '%s'", filename);
+
+  FreeBitmap(dst_bitmap);
+
+  Info("Done.");
+
+  CloseAllAndExit(0);
+}
+
+
 // ----------------------------------------------------------------------------
 // create and save images for custom and group elements (raw BMP format)
 // ----------------------------------------------------------------------------