X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=5d8f6479387a22bd0ec5c25424e865265bc37418;hp=aaafe68a64aba2ef4db5d69a4354e371b6fdb4ff;hb=13fc9c40050cdd760fd457a9c83d0611f95fcd1e;hpb=ad67feea72c2db12d75bb34b27193eacc00bbaef

diff --git a/src/files.c b/src/files.c
index aaafe68a..5d8f6479 100644
--- a/src/files.c
+++ b/src/files.c
@@ -22,6 +22,7 @@
 #include "tools.h"
 #include "tape.h"
 #include "config.h"
+#include "api.h"
 
 #define ENABLE_UNUSED_CODE	0	// currently unused functions
 #define ENABLE_HISTORIC_CHUNKS	0	// only for historic reference
@@ -51,6 +52,7 @@
 
 // (element number only)
 #define LEVEL_CHUNK_GRPX_UNCHANGED	2
+#define LEVEL_CHUNK_EMPX_UNCHANGED	2
 #define LEVEL_CHUNK_NOTE_UNCHANGED	2
 
 // (nothing at all if unchanged)
@@ -58,7 +60,6 @@
 
 #define TAPE_CHUNK_VERS_SIZE	8	// size of file version chunk
 #define TAPE_CHUNK_HEAD_SIZE	20	// size of tape file header
-#define TAPE_CHUNK_HEAD_UNUSED	1	// unused tape header bytes
 #define TAPE_CHUNK_SCRN_SIZE	2	// size of screen size chunk
 
 #define SCORE_CHUNK_VERS_SIZE	8	// size of file version chunk
@@ -1376,6 +1377,26 @@ static struct LevelFileConfigInfo chunk_config_GRPX[] =
   }
 };
 
+static struct LevelFileConfigInfo chunk_config_EMPX[] =
+{
+  {
+    -1,					-1,
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(1),
+    &xx_ei.use_gfx_element,		FALSE
+  },
+  {
+    -1,					-1,
+    TYPE_ELEMENT,			CONF_VALUE_16_BIT(1),
+    &xx_ei.gfx_element_initial,		EL_EMPTY_SPACE
+  },
+
+  {
+    -1,					-1,
+    -1,					-1,
+    NULL,				-1
+  }
+};
+
 static struct LevelFileConfigInfo chunk_config_CONF[] =		// (OBSOLETE)
 {
   {
@@ -1893,6 +1914,16 @@ static void setLevelInfoToDefaults_Elements(struct LevelInfo *level)
 
       *group = xx_group;
     }
+
+    if (IS_EMPTY_ELEMENT(element) ||
+	IS_INTERNAL_ELEMENT(element))
+    {
+      xx_ei = *ei;		// copy element data into temporary buffer
+
+      setConfigToDefaultsFromConfigList(chunk_config_EMPX);
+
+      *ei = xx_ei;
+    }
   }
 
   clipboard_elements_initialized = TRUE;
@@ -2814,9 +2845,10 @@ static int LoadLevel_CUS3(File *file, int chunk_size, struct LevelInfo *level)
       for (x = 0; x < 3; x++)
 	ei->content.e[x][y] = getMappedElement(getFile16BitBE(file));
 
+    // bits 0 - 31 of "has_event[]"
     event_bits = getFile32BitBE(file);
-    for (j = 0; j < NUM_CHANGE_EVENTS; j++)
-      if (event_bits & (1 << j))
+    for (j = 0; j < MIN(NUM_CHANGE_EVENTS, 32); j++)
+      if (event_bits & (1u << j))
 	ei->change->has_event[j] = TRUE;
 
     ei->change->target_element = getMappedElement(getFile16BitBE(file));
@@ -2952,7 +2984,7 @@ static int LoadLevel_CUS4(File *file, int chunk_size, struct LevelInfo *level)
     // bits 0 - 31 of "has_event[]" ...
     event_bits = getFile32BitBE(file);
     for (j = 0; j < MIN(NUM_CHANGE_EVENTS, 32); j++)
-      if (event_bits & (1 << j))
+      if (event_bits & (1u << j))
 	change->has_event[j] = TRUE;
 
     change->target_element = getMappedElement(getFile16BitBE(file));
@@ -2993,7 +3025,7 @@ static int LoadLevel_CUS4(File *file, int chunk_size, struct LevelInfo *level)
     // ... bits 32 - 39 of "has_event[]" (not nice, but downward compatible)
     event_bits = getFile8Bit(file);
     for (j = 32; j < NUM_CHANGE_EVENTS; j++)
-      if (event_bits & (1 << (j - 32)))
+      if (event_bits & (1u << (j - 32)))
 	change->has_event[j] = TRUE;
   }
 
@@ -3160,7 +3192,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;
 
@@ -3322,6 +3354,10 @@ static int LoadLevel_CUSX(File *file, int chunk_size, struct LevelInfo *level)
 
   while (!checkEndOfFile(file))
   {
+    // level file might contain invalid change page number
+    if (xx_current_change_page >= ei->num_change_pages)
+      break;
+
     struct ElementChangeInfo *change = &ei->change_page[xx_current_change_page];
 
     xx_change = *change;	// copy change data into temporary buffer
@@ -3351,6 +3387,9 @@ static int LoadLevel_GRPX(File *file, int chunk_size, struct LevelInfo *level)
   struct ElementInfo *ei = &element_info[element];
   struct ElementGroupInfo *group = ei->group;
 
+  if (group == NULL)
+    return -1;
+
   xx_ei = *ei;		// copy element data into temporary buffer
   xx_group = *group;	// copy group data into temporary buffer
 
@@ -3371,6 +3410,30 @@ static int LoadLevel_GRPX(File *file, int chunk_size, struct LevelInfo *level)
   return real_chunk_size;
 }
 
+static int LoadLevel_EMPX(File *file, int chunk_size, struct LevelInfo *level)
+{
+  int element = getMappedElement(getFile16BitBE(file));
+  int real_chunk_size = 2;
+  struct ElementInfo *ei = &element_info[element];
+
+  xx_ei = *ei;		// copy element data into temporary buffer
+
+  while (!checkEndOfFile(file))
+  {
+    real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_EMPX,
+					    -1, element);
+
+    if (real_chunk_size >= chunk_size)
+      break;
+  }
+
+  *ei = xx_ei;
+
+  level->file_has_custom_elements = TRUE;
+
+  return real_chunk_size;
+}
+
 static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
 				      struct LevelFileInfo *level_file_info,
 				      boolean level_info_only)
@@ -3493,6 +3556,7 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
       { "NOTE", -1,			LoadLevel_NOTE },
       { "CUSX", -1,			LoadLevel_CUSX },
       { "GRPX", -1,			LoadLevel_GRPX },
+      { "EMPX", -1,			LoadLevel_EMPX },
 
       {  NULL,  0,			NULL }
     };
@@ -3526,6 +3590,14 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
 	int chunk_size_expected =
 	  (chunk_info[i].loader)(file, chunk_size, level);
 
+	if (chunk_size_expected < 0)
+	{
+	  Warn("error reading chunk '%s' in level file '%s'",
+	       chunk_name, filename);
+
+	  break;
+	}
+
 	// the size of some chunks cannot be checked before reading other
 	// chunks first (like "HEAD" and "BODY") that contain some header
 	// information, so check them here
@@ -3533,6 +3605,8 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level,
 	{
 	  Warn("wrong size (%d) of chunk '%s' in level file '%s'",
 	       chunk_size, chunk_name, filename);
+
+	  break;
 	}
       }
     }
@@ -3642,7 +3716,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]);
 
@@ -5895,6 +5969,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)
@@ -6128,14 +6217,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;
   }
 }
@@ -6474,6 +6560,37 @@ static void LoadLevel_InitVersion(struct LevelInfo *level)
     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);
+
+  // rename levels with title "nameless level" or if renaming is forced
+  if (leveldir_current->empty_level_name != NULL &&
+      (strEqual(level->name, NAMELESS_LEVEL_NAME) ||
+       leveldir_current->force_level_name))
+    snprintf(level->name, MAX_LEVEL_NAME_LEN + 1,
+	     leveldir_current->empty_level_name, level_nr);
+}
+
 static void LoadLevel_InitStandardElements(struct LevelInfo *level)
 {
   int i, x, y;
@@ -6700,6 +6817,7 @@ static void LoadLevelTemplate_LoadAndInit(void)
 
   LoadLevel_InitVersion(&level_template);
   LoadLevel_InitElements(&level_template);
+  LoadLevel_InitSettings(&level_template);
 
   ActivateLevelTemplate();
 }
@@ -6740,6 +6858,7 @@ static void LoadLevel_LoadAndInit(struct NetworkLevelInfo *network_level)
   LoadLevel_InitVersion(&level);
   LoadLevel_InitElements(&level);
   LoadLevel_InitPlayfield(&level);
+  LoadLevel_InitSettings(&level);
 
   LoadLevel_InitNativeEngines(&level);
 }
@@ -7208,7 +7327,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
     event_bits = 0;
     for (j = 0; j < MIN(NUM_CHANGE_EVENTS, 32); j++)
       if (change->has_event[j])
-	event_bits |= (1 << j);
+	event_bits |= (1u << j);
     putFile32BitBE(file, event_bits);
 
     putFile16BitBE(file, change->target_element);
@@ -7248,7 +7367,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
     event_bits = 0;
     for (j = 32; j < NUM_CHANGE_EVENTS; j++)
       if (change->has_event[j])
-	event_bits |= (1 << (j - 32));
+	event_bits |= (1u << (j - 32));
     putFile8Bit(file, event_bits);
   }
 }
@@ -7499,6 +7618,22 @@ static int SaveLevel_GRPX(FILE *file, struct LevelInfo *level, int element)
   return chunk_size;
 }
 
+static int SaveLevel_EMPX(FILE *file, struct LevelInfo *level, int element)
+{
+  struct ElementInfo *ei = &element_info[element];
+  int chunk_size = 0;
+  int i;
+
+  chunk_size += putFile16BitBE(file, element);
+
+  xx_ei = *ei;		// copy element data into temporary buffer
+
+  for (i = 0; chunk_config_EMPX[i].data_type != -1; i++)
+    chunk_size += SaveLevel_MicroChunk(file, &chunk_config_EMPX[i], FALSE);
+
+  return chunk_size;
+}
+
 static void SaveLevelFromFilename(struct LevelInfo *level, char *filename,
 				  boolean save_as_template)
 {
@@ -7590,6 +7725,18 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename,
 	SaveLevel_GRPX(file, level, element);
       }
     }
+
+    for (i = 0; i < NUM_EMPTY_ELEMENTS_ALL; i++)
+    {
+      int element = GET_EMPTY_ELEMENT(i);
+
+      chunk_size = SaveLevel_EMPX(NULL, level, element);
+      if (chunk_size > LEVEL_CHUNK_EMPX_UNCHANGED)	// save if changed
+      {
+	putFileChunkBE(file, "EMPX", chunk_size);
+	SaveLevel_EMPX(file, level, element);
+      }
+    }
   }
 
   fclose(file);
@@ -7667,6 +7814,28 @@ void DumpLevel(struct LevelInfo *level)
   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"));
 
+  if (options.debug)
+  {
+    int i, j;
+
+    for (i = 0; i < NUM_ENVELOPES; i++)
+    {
+      char *text = level->envelope[i].text;
+      int text_len = strlen(text);
+      boolean has_text = FALSE;
+
+      for (j = 0; j < text_len; j++)
+	if (text[j] != ' ' && text[j] != '\n')
+	  has_text = TRUE;
+
+      if (has_text)
+      {
+	Print("\n");
+	Print("Envelope %d:\n'%s'\n", i + 1, text);
+      }
+    }
+  }
+
   PrintLine("-", 79);
 }
 
@@ -7717,6 +7886,7 @@ static void setTapeInfoToDefaults(void)
   tape.level_nr = level_nr;
   tape.counter = 0;
   tape.changed = FALSE;
+  tape.solved = FALSE;
 
   tape.recording = FALSE;
   tape.playing = FALSE;
@@ -7725,6 +7895,7 @@ static void setTapeInfoToDefaults(void)
   tape.scr_fieldx = SCR_FIELDX_DEFAULT;
   tape.scr_fieldy = SCR_FIELDY_DEFAULT;
 
+  tape.no_info_chunk = TRUE;
   tape.no_valid_file = FALSE;
 }
 
@@ -7802,8 +7973,7 @@ static int LoadTape_HEAD(File *file, int chunk_size, struct TapeInfo *tape)
     setTapeActionFlags(tape, getFile8Bit(file));
 
     tape->property_bits = getFile8Bit(file);
-
-    ReadUnusedBytesFromFile(file, TAPE_CHUNK_HEAD_UNUSED);
+    tape->solved = getFile8Bit(file);
 
     engine_version = getFileVersion(file);
     if (engine_version > 0)
@@ -7829,6 +7999,8 @@ static int LoadTape_INFO(File *file, int chunk_size, struct TapeInfo *tape)
   int level_identifier_size;
   int i;
 
+  tape->no_info_chunk = FALSE;
+
   level_identifier_size = getFile16BitBE(file);
 
   level_identifier = checked_malloc(level_identifier_size);
@@ -8199,6 +8371,20 @@ void LoadSolutionTape(int nr)
     CopyNativeTape_SP_to_RND(&level);
 }
 
+void LoadScoreTape(char *score_tape_basename, int nr)
+{
+  char *filename = getScoreTapeFilename(score_tape_basename, nr);
+
+  LoadTapeFromFilename(filename);
+}
+
+void LoadScoreCacheTape(char *score_tape_basename, int nr)
+{
+  char *filename = getScoreCacheTapeFilename(score_tape_basename, nr);
+
+  LoadTapeFromFilename(filename);
+}
+
 static boolean checkSaveTape_SCRN(struct TapeInfo *tape)
 {
   // chunk required for team mode tapes with non-default screen size
@@ -8232,9 +8418,7 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
   putFile8Bit(file, getTapeActionValue(tape));
 
   putFile8Bit(file, tape->property_bits);
-
-  // unused bytes not at the end here for 4-byte alignment of engine_version
-  WriteUnusedBytesToFile(file, TAPE_CHUNK_HEAD_UNUSED);
+  putFile8Bit(file, tape->solved);
 
   putFileVersion(file, tape->engine_version);
 }
@@ -8409,11 +8593,47 @@ 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("Solution tape: %s\n",
+	tape->solved ? "yes" :
+	tape->game_version < VERSION_IDENT(4,3,2,3) ? "unknown" : "no");
+
+  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");
+
+  int year2 = tape->date / 10000;
+  int year4 = (year2 < 70 ? 2000 + year2 : 1900 + year2);
+  int month_index_raw = (tape->date / 100) % 100;
+  int month_index = month_index_raw % 12;	// prevent invalid index
+  int month = month_index + 1;
+  int day = tape->date % 100;
+
+  Print("Tape date: %04d-%02d-%02d\n", year4, month, day);
+
   PrintLine("-", 79);
 
   tape_frame_counter = 0;
@@ -8492,6 +8712,13 @@ static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
     strcpy(scores->entry[i].name, EMPTY_PLAYER_NAME);
     scores->entry[i].score = 0;
     scores->entry[i].time = 0;
+
+    scores->entry[i].id = -1;
+    strcpy(scores->entry[i].tape_date,    UNKNOWN_NAME);
+    strcpy(scores->entry[i].platform,     UNKNOWN_NAME);
+    strcpy(scores->entry[i].version,      UNKNOWN_NAME);
+    strcpy(scores->entry[i].country_name, UNKNOWN_NAME);
+    strcpy(scores->entry[i].country_code, "??");
   }
 
   scores->num_entries = 0;
@@ -8499,7 +8726,16 @@ static void setScoreInfoToDefaultsExt(struct ScoreInfo *scores)
   scores->last_added_local = -1;
 
   scores->updated = FALSE;
+  scores->uploaded = FALSE;
+  scores->tape_downloaded = FALSE;
   scores->force_last_added = FALSE;
+
+  // The following values are intentionally not reset here:
+  // - last_level_nr
+  // - last_entry_nr
+  // - next_level_nr
+  // - continue_playing
+  // - continue_on_return
 }
 
 static void setScoreInfoToDefaults(void)
@@ -8646,6 +8882,18 @@ static int LoadScore_SCOR(File *file, int chunk_size, struct ScoreInfo *scores)
   return chunk_size;
 }
 
+static int LoadScore_SC4R(File *file, int chunk_size, struct ScoreInfo *scores)
+{
+  int i;
+
+  for (i = 0; i < scores->num_entries; i++)
+    scores->entry[i].score = getFile32BitBE(file);
+
+  chunk_size = scores->num_entries * 4;
+
+  return chunk_size;
+}
+
 static int LoadScore_TIME(File *file, int chunk_size, struct ScoreInfo *scores)
 {
   int i;
@@ -8747,6 +8995,7 @@ void LoadScore(int nr)
       { "INFO", -1,			LoadScore_INFO },
       { "NAME", -1,			LoadScore_NAME },
       { "SCOR", -1,			LoadScore_SCOR },
+      { "SC4R", -1,			LoadScore_SC4R },
       { "TIME", -1,			LoadScore_TIME },
       { "TAPE", -1,			LoadScore_TAPE },
 
@@ -8866,6 +9115,14 @@ static void SaveScore_SCOR(FILE *file, struct ScoreInfo *scores)
     putFile16BitBE(file, scores->entry[i].score);
 }
 
+static void SaveScore_SC4R(FILE *file, struct ScoreInfo *scores)
+{
+  int i;
+
+  for (i = 0; i < scores->num_entries; i++)
+    putFile32BitBE(file, scores->entry[i].score);
+}
+
 static void SaveScore_TIME(FILE *file, struct ScoreInfo *scores)
 {
   int i;
@@ -8893,8 +9150,11 @@ static void SaveScoreToFilename(char *filename)
   int info_chunk_size;
   int name_chunk_size;
   int scor_chunk_size;
+  int sc4r_chunk_size;
   int time_chunk_size;
   int tape_chunk_size;
+  boolean has_large_score_values;
+  int i;
 
   if (!(file = fopen(filename, MODE_WRITE)))
   {
@@ -8906,9 +9166,15 @@ static void SaveScoreToFilename(char *filename)
   info_chunk_size = 2 + (strlen(scores.level_identifier) + 1) + 2 + 2;
   name_chunk_size = scores.num_entries * MAX_PLAYER_NAME_LEN;
   scor_chunk_size = scores.num_entries * 2;
+  sc4r_chunk_size = scores.num_entries * 4;
   time_chunk_size = scores.num_entries * 4;
   tape_chunk_size = scores.num_entries * MAX_SCORE_TAPE_BASENAME_LEN;
 
+  has_large_score_values = FALSE;
+  for (i = 0; i < scores.num_entries; i++)
+    if (scores.entry[i].score > 0xffff)
+      has_large_score_values = TRUE;
+
   putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED);
   putFileChunkBE(file, "SCOR", CHUNK_SIZE_NONE);
 
@@ -8921,8 +9187,16 @@ static void SaveScoreToFilename(char *filename)
   putFileChunkBE(file, "NAME", name_chunk_size);
   SaveScore_NAME(file, &scores);
 
-  putFileChunkBE(file, "SCOR", scor_chunk_size);
-  SaveScore_SCOR(file, &scores);
+  if (has_large_score_values)
+  {
+    putFileChunkBE(file, "SC4R", sc4r_chunk_size);
+    SaveScore_SC4R(file, &scores);
+  }
+  else
+  {
+    putFileChunkBE(file, "SCOR", scor_chunk_size);
+    SaveScore_SCOR(file, &scores);
+  }
 
   putFileChunkBE(file, "TIME", time_chunk_size);
   SaveScore_TIME(file, &scores);
@@ -8964,115 +9238,6 @@ void SaveScore(int nr)
   SaveScoreToFilename(filename);
 }
 
-static void ExecuteAsThread(SDL_ThreadFunction function, char *name, int data,
-			    char *error)
-{
-  static int data_static;
-
-  data_static = data;
-
-  SDL_Thread *thread = SDL_CreateThread(function, name, &data_static);
-
-  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);
-}
-
-static void DownloadServerScoreToCacheExt(struct HttpRequest *request,
-					  struct HttpResponse *response,
-					  int nr)
-{
-  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"
-	   "  \"levelset_identifier\":  \"%s\",\n"
-	   "  \"level_nr\":             \"%d\",\n"
-	   "  \"rate_time_over_score\": \"%d\"\n"
-	   "}\n",
-	   levelset.identifier, nr, level.rate_time_over_score);
-
-  if (!DoHttpRequest(request, response))
-  {
-    Error("HTTP request failed: %s", GetHttpError());
-
-    return;
-  }
-
-  if (!HTTP_SUCCESS(response->status_code))
-  {
-    Error("server failed to handle request: %d %s",
-	  response->status_code,
-	  response->status_text);
-
-    return;
-  }
-
-  if (response->body_size == 0)
-  {
-    // no scores available for this level
-
-    return;
-  }
-
-  ConvertHttpResponseBodyToClientEncoding(response);
-
-  char *filename = getScoreCacheFilename(nr);
-  FILE *file;
-  int i;
-
-  // used instead of "leveldir_current->subdir" (for network games)
-  InitScoreCacheDirectory(levelset.identifier);
-
-  if (!(file = fopen(filename, MODE_WRITE)))
-  {
-    Warn("cannot save score cache file '%s'", filename);
-
-    return;
-  }
-
-  for (i = 0; i < response->body_size; i++)
-    fputc(response->body[i], file);
-
-  fclose(file);
-
-  SetFilePermissions(filename, PERMS_PRIVATE);
-
-  server_scores.updated = TRUE;
-}
-
-static void DownloadServerScoreToCache(int nr)
-{
-  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
-  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
-
-  DownloadServerScoreToCacheExt(request, response, nr);
-
-  checked_free(request);
-  checked_free(response);
-}
-
-static int DownloadServerScoreToCacheThread(void *data)
-{
-  DownloadServerScoreToCache(*(int *)data);
-
-  return 0;
-}
-
-static void DownloadServerScoreToCacheAsThread(int nr)
-{
-  ExecuteAsThread(DownloadServerScoreToCacheThread,
-		  "DownloadServerScoreToCache", nr,
-		  "download scores from server");
-}
-
 static void LoadServerScoreFromCache(int nr)
 {
   struct ScoreEntry score_entry;
@@ -9088,6 +9253,12 @@ static void LoadServerScoreFromCache(int nr)
     { &score_entry.time,		FALSE,	0			},
     { score_entry.name,			TRUE,	MAX_PLAYER_NAME_LEN	},
     { score_entry.tape_basename,	TRUE,	MAX_FILENAME_LEN	},
+    { score_entry.tape_date,		TRUE,	MAX_ISO_DATE_LEN	},
+    { &score_entry.id,			FALSE,	0			},
+    { score_entry.platform,		TRUE,	MAX_PLATFORM_TEXT_LEN	},
+    { score_entry.version,		TRUE,	MAX_VERSION_TEXT_LEN	},
+    { score_entry.country_code,		TRUE,	MAX_COUNTRY_CODE_LEN	},
+    { score_entry.country_name,		TRUE,	MAX_COUNTRY_NAME_LEN	},
 
     { NULL,				FALSE,	0			}
   };
@@ -9141,7 +9312,7 @@ static void LoadServerScoreFromCache(int nr)
 
 void LoadServerScore(int nr, boolean download_score)
 {
-  if (!setup.api_server)
+  if (!setup.use_api_server)
     return;
 
   // always start with reliable default values
@@ -9151,181 +9322,65 @@ void LoadServerScore(int nr, boolean download_score)
   // (this should prevent reading it while the thread is writing to it)
   LoadServerScoreFromCache(nr);
 
-  if (download_score && runtime.api_server)
+  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);
+    ApiGetScoreAsThread(nr);
   }
 }
 
-static char *get_file_base64(char *filename)
+void PrepareScoreTapesForUpload(char *leveldir_subdir)
 {
-  struct stat file_status;
-
-  if (stat(filename, &file_status) != 0)
-  {
-    Error("cannot stat file '%s'\n", filename);
-
-    return NULL;
-  }
-
-  int buffer_size = file_status.st_size;
-  byte *buffer = checked_malloc(buffer_size);
-  FILE *file;
-  int i;
-
-  if (!(file = fopen(filename, MODE_READ)))
-  {
-    Error("cannot open file '%s'\n", filename);
-
-    checked_free(buffer);
-
-    return NULL;
-  }
-
-  for (i = 0; i < buffer_size; i++)
-  {
-    int c = fgetc(file);
+  MarkTapeDirectoryUploadsAsIncomplete(leveldir_subdir);
 
-    if (c == EOF)
-    {
-      Error("cannot read from input file '%s'\n", filename);
-
-      fclose(file);
-      checked_free(buffer);
-
-      return NULL;
-    }
-
-    buffer[i] = (byte)c;
-  }
-
-  fclose(file);
+  // if score tape not uploaded, ask for uploading missing tapes later
+  if (!setup.has_remaining_tapes)
+    setup.ask_for_remaining_tapes = TRUE;
 
-  int buffer_encoded_size = base64_encoded_size(buffer_size);
-  char *buffer_encoded = checked_malloc(buffer_encoded_size);
+  setup.provide_uploading_tapes = TRUE;
+  setup.has_remaining_tapes = TRUE;
 
-  base64_encode(buffer_encoded, buffer, buffer_size);
-
-  checked_free(buffer);
-
-  return buffer_encoded;
+  SaveSetup_ServerSetup();
 }
 
-static void UploadScoreToServerExt(struct HttpRequest *request,
-				   struct HttpResponse *response,
-				   int nr)
+void SaveServerScore(int nr, boolean tape_saved)
 {
-  struct ScoreEntry *score_entry = &scores.entry[scores.last_added];
-
-  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);
-
-  if (tape_base64 == NULL)
-  {
-    Error("loading and base64 encoding score tape file failed");
-
-    return;
-  }
-
-  snprintf(request->body, MAX_HTTP_BODY_SIZE,
-	   "{\n"
-	   "  \"game_version\":         \"%s\",\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"
-	   "  \"player_name\":          \"%s\",\n"
-	   "  \"score\":                \"%d\",\n"
-	   "  \"time\":                 \"%d\",\n"
-	   "  \"tape_basename\":        \"%s\",\n"
-	   "  \"tape\":                 \"%s\"\n"
-	   "}\n",
-	   getProgramRealVersionString(),
-	   leveldir_current->identifier,
-	   leveldir_current->name,
-	   leveldir_current->author,
-	   leveldir_current->levels,
-	   leveldir_current->first_level,
-	   level_nr,
-	   score_entry->name,
-	   score_entry->score,
-	   score_entry->time,
-	   score_entry->tape_basename,
-	   tape_base64);
-
-  checked_free(tape_base64);
-
-  ConvertHttpRequestBodyToServerEncoding(request);
-
-  if (!DoHttpRequest(request, response))
-  {
-    Error("HTTP request failed: %s", GetHttpError());
-
-    return;
-  }
-
-  if (!HTTP_SUCCESS(response->status_code))
+  if (!runtime.use_api_server)
   {
-    Error("server failed to handle request: %d %s",
-	  response->status_code,
-	  response->status_text);
+    PrepareScoreTapesForUpload(leveldir_current->subdir);
 
     return;
   }
-}
-
-static void UploadScoreToServer(int nr)
-{
-  struct HttpRequest *request = checked_calloc(sizeof(struct HttpRequest));
-  struct HttpResponse *response = checked_calloc(sizeof(struct HttpResponse));
-
-  UploadScoreToServerExt(request, response, nr);
-
-  checked_free(request);
-  checked_free(response);
-}
-
-static int UploadScoreToServerThread(void *data)
-{
-  UploadScoreToServer(*(int *)data);
 
-  return 0;
+  ApiAddScoreAsThread(nr, tape_saved, NULL);
 }
 
-static void UploadScoreToServerAsThread(int nr)
+void SaveServerScoreFromFile(int nr, boolean tape_saved,
+			     char *score_tape_filename)
 {
-  ExecuteAsThread(UploadScoreToServerThread,
-		  "UploadScoreToServer", nr,
-		  "upload score to server");
-}
-
-void SaveServerScore(int nr)
-{
-  if (!runtime.api_server)
+  if (!runtime.use_api_server)
     return;
 
-  UploadScoreToServerAsThread(nr);
+  ApiAddScoreAsThread(nr, tape_saved, score_tape_filename);
 }
 
 void LoadLocalAndServerScore(int nr, boolean download_score)
 {
   int last_added_local = scores.last_added_local;
+  boolean force_last_added = scores.force_last_added;
+
+  // needed if only showing server scores
+  setScoreInfoToDefaults();
 
-  LoadScore(nr);
+  if (!strEqual(setup.scores_in_highscore_list, STR_SCORES_TYPE_SERVER_ONLY))
+    LoadScore(nr);
 
   // restore last added local score entry (before merging server scores)
   scores.last_added = scores.last_added_local = last_added_local;
 
-  if (setup.api_server && !setup.only_show_local_scores)
+  if (setup.use_api_server &&
+      !strEqual(setup.scores_in_highscore_list, STR_SCORES_TYPE_LOCAL_ONLY))
   {
     // load server scores from cache file and trigger update from server
     LoadServerScore(nr, download_score);
@@ -9333,6 +9388,9 @@ void LoadLocalAndServerScore(int nr, boolean download_score)
     // merge local scores with scores from server
     MergeServerScore();
   }
+
+  if (force_last_added)
+    scores.force_last_added = force_last_added;
 }
 
 
@@ -9401,6 +9459,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_SWITCH,
     &setup.autorecord,				"automatic_tape_recording"
   },
+  {
+    TYPE_SWITCH,
+    &setup.auto_pause_on_start,			"auto_pause_on_start"
+  },
   {
     TYPE_SWITCH,
     &setup.show_titlescreen,			"show_titlescreen"
@@ -9519,11 +9581,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.only_show_local_scores,		"only_show_local_scores"
+    &setup.show_undo_redo_buttons,		"show_undo_redo_buttons"
+  },
+  {
+    TYPE_STRING,
+    &setup.scores_in_highscore_list,		"scores_in_highscore_list"
   },
   {
     TYPE_STRING,
@@ -9573,14 +9639,6 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_STRING,
     &setup.network_server_hostname,		"network_server_hostname"
   },
-  {
-    TYPE_SWITCH,
-    &setup.api_server,				"api_server"
-  },
-  {
-    TYPE_STRING,
-    &setup.api_server_hostname,			"api_server_hostname"
-  },
   {
     TYPE_STRING,
     &setup.touch.control_type,			"touch.control_type"
@@ -9621,6 +9679,10 @@ static struct TokenInfo global_setup_tokens[] =
     TYPE_INTEGER,
     &setup.touch.grid_ysize[1],			"touch.virtual_buttons.1.ysize"
   },
+  {
+    TYPE_SWITCH,
+    &setup.touch.overlay_buttons,		"touch.overlay_buttons"
+  },
 };
 
 static struct TokenInfo auto_setup_tokens[] =
@@ -9631,6 +9693,50 @@ static struct TokenInfo auto_setup_tokens[] =
   },
 };
 
+static struct TokenInfo server_setup_tokens[] =
+{
+  {
+    TYPE_STRING,
+    &setup.player_uuid,				"player_uuid"
+  },
+  {
+    TYPE_INTEGER,
+    &setup.player_version,			"player_version"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.use_api_server,          TEST_PREFIX	"use_api_server"
+  },
+  {
+    TYPE_STRING,
+    &setup.api_server_hostname,     TEST_PREFIX	"api_server_hostname"
+  },
+  {
+    TYPE_STRING,
+    &setup.api_server_password,     TEST_PREFIX	"api_server_password"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.ask_for_uploading_tapes, TEST_PREFIX	"ask_for_uploading_tapes"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.ask_for_remaining_tapes, TEST_PREFIX	"ask_for_remaining_tapes"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.provide_uploading_tapes, TEST_PREFIX	"provide_uploading_tapes"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.ask_for_using_api_server,TEST_PREFIX	"ask_for_using_api_server"
+  },
+  {
+    TYPE_SWITCH,
+    &setup.has_remaining_tapes,     TEST_PREFIX	"has_remaining_tapes"
+  },
+};
+
 static struct TokenInfo editor_setup_tokens[] =
 {
   {
@@ -9721,6 +9827,10 @@ static struct TokenInfo editor_cascade_setup_tokens[] =
     TYPE_SWITCH,
     &setup.editor_cascade.el_ge,		"editor.cascade.el_ge"
   },
+  {
+    TYPE_SWITCH,
+    &setup.editor_cascade.el_es,		"editor.cascade.el_es"
+  },
   {
     TYPE_SWITCH,
     &setup.editor_cascade.el_ref,		"editor.cascade.el_ref"
@@ -9745,6 +9855,14 @@ static struct TokenInfo shortcut_setup_tokens[] =
     TYPE_KEY_X11,
     &setup.shortcut.load_game,			"shortcut.load_game"
   },
+  {
+    TYPE_KEY_X11,
+    &setup.shortcut.restart_game,		"shortcut.restart_game"
+  },
+  {
+    TYPE_KEY_X11,
+    &setup.shortcut.pause_before_end,		"shortcut.pause_before_end"
+  },
   {
     TYPE_KEY_X11,
     &setup.shortcut.toggle_pause,		"shortcut.toggle_pause"
@@ -10034,6 +10152,38 @@ static struct TokenInfo internal_setup_tokens[] =
     TYPE_BOOLEAN,
     &setup.internal.menu_save_and_exit,		"menu_save_and_exit"
   },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_title,			"info_title"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_elements,		"info_elements"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_music,			"info_music"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_credits,		"info_credits"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_program,		"info_program"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_version,		"info_version"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_levelset,		"info_levelset"
+  },
+  {
+    TYPE_BOOLEAN,
+    &setup.internal.info_exit,			"info_exit"
+  },
 };
 
 static struct TokenInfo debug_setup_tokens[] =
@@ -10167,6 +10317,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT;
   si->fade_screens = TRUE;
   si->autorecord = TRUE;
+  si->auto_pause_on_start = FALSE;
   si->show_titlescreen = TRUE;
   si->quick_doors = FALSE;
   si->team_mode = FALSE;
@@ -10196,8 +10347,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->only_show_local_scores = FALSE;
+  si->show_load_save_buttons = FALSE;
+  si->show_undo_redo_buttons = FALSE;
+  si->scores_in_highscore_list = getStringCopy(STR_SCORES_TYPE_DEFAULT);
 
   si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR);
   si->sounds_set   = getStringCopy(SND_CLASSIC_SUBDIR);
@@ -10215,9 +10367,6 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
   si->network_player_nr = 0;		// first player
   si->network_server_hostname = getStringCopy(STR_NETWORK_AUTO_DETECT);
 
-  si->api_server = TRUE;
-  si->api_server_hostname = getStringCopy(API_SERVER_HOSTNAME);
-
   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
@@ -10274,6 +10423,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->touch.grid_initialized		= video.initialized;
 
+  si->touch.overlay_buttons		= FALSE;
+
   si->editor.el_boulderdash		= TRUE;
   si->editor.el_emerald_mine		= TRUE;
   si->editor.el_emerald_mine_club	= TRUE;
@@ -10305,6 +10456,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
   si->shortcut.save_game	= DEFAULT_KEY_SAVE_GAME;
   si->shortcut.load_game	= DEFAULT_KEY_LOAD_GAME;
+  si->shortcut.restart_game	= DEFAULT_KEY_RESTART_GAME;
+  si->shortcut.pause_before_end	= DEFAULT_KEY_PAUSE_BEFORE_END;
   si->shortcut.toggle_pause	= DEFAULT_KEY_TOGGLE_PAUSE;
 
   si->shortcut.focus_player[0]	= DEFAULT_KEY_FOCUS_PLAYER_1;
@@ -10414,6 +10567,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si)
 
 #if defined(PLATFORM_ANDROID)
   si->fullscreen = TRUE;
+  si->touch.overlay_buttons = TRUE;
 #endif
 
   setHideSetupEntry(&setup.debug.xsn_mode);
@@ -10424,6 +10578,21 @@ static void setSetupInfoToDefaults_AutoSetup(struct SetupInfo *si)
   si->auto_setup.editor_zoom_tilesize = MINI_TILESIZE;
 }
 
+static void setSetupInfoToDefaults_ServerSetup(struct SetupInfo *si)
+{
+  si->player_uuid = NULL;	// (will be set later)
+  si->player_version = 1;	// (will be set later)
+
+  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->ask_for_remaining_tapes = FALSE;
+  si->provide_uploading_tapes = TRUE;
+  si->ask_for_using_api_server = TRUE;
+  si->has_remaining_tapes = FALSE;
+}
+
 static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)
 {
   si->editor_cascade.el_bd		= TRUE;
@@ -10442,6 +10611,7 @@ static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si)
   si->editor_cascade.el_steel_chars	= FALSE;
   si->editor_cascade.el_ce		= FALSE;
   si->editor_cascade.el_ge		= FALSE;
+  si->editor_cascade.el_es		= FALSE;
   si->editor_cascade.el_ref		= FALSE;
   si->editor_cascade.el_user		= FALSE;
   si->editor_cascade.el_dynamic		= FALSE;
@@ -10511,7 +10681,7 @@ static void setSetupInfoFromTokenInfo(SetupFileHash *setup_file_hash,
 			    token_info[token_nr].text);
 }
 
-static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
+static void decodeSetupFileHash_Default(SetupFileHash *setup_file_hash)
 {
   int i, pnr;
 
@@ -10611,6 +10781,19 @@ static void decodeSetupFileHash_AutoSetup(SetupFileHash *setup_file_hash)
 			      auto_setup_tokens[i].text));
 }
 
+static void decodeSetupFileHash_ServerSetup(SetupFileHash *setup_file_hash)
+{
+  int i;
+
+  if (!setup_file_hash)
+    return;
+
+  for (i = 0; i < ARRAY_SIZE(server_setup_tokens); i++)
+    setSetupInfo(server_setup_tokens, i,
+		 getHashEntry(setup_file_hash,
+			      server_setup_tokens[i].text));
+}
+
 static void decodeSetupFileHash_EditorCascade(SetupFileHash *setup_file_hash)
 {
   int i;
@@ -10667,7 +10850,7 @@ void LoadSetupFromFilename(char *filename)
 
   if (setup_file_hash)
   {
-    decodeSetupFileHash(setup_file_hash);
+    decodeSetupFileHash_Default(setup_file_hash);
 
     freeSetupFileHash(setup_file_hash);
   }
@@ -10698,7 +10881,7 @@ static void LoadSetup_SpecialPostProcessing(void)
     MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY);
 }
 
-void LoadSetup(void)
+void LoadSetup_Default(void)
 {
   char *filename;
 
@@ -10708,6 +10891,12 @@ void LoadSetup(void)
   // try to load setup values from default setup file
   filename = getDefaultSetupFilename();
 
+  if (fileExists(filename))
+    LoadSetupFromFilename(filename);
+
+  // try to load setup values from platform setup file
+  filename = getPlatformSetupFilename();
+
   if (fileExists(filename))
     LoadSetupFromFilename(filename);
 
@@ -10739,6 +10928,35 @@ void LoadSetup_AutoSetup(void)
   free(filename);
 }
 
+void LoadSetup_ServerSetup(void)
+{
+  char *filename = getPath2(getSetupDir(), SERVERSETUP_FILENAME);
+  SetupFileHash *setup_file_hash = NULL;
+
+  // always start with reliable default values
+  setSetupInfoToDefaults_ServerSetup(&setup);
+
+  setup_file_hash = loadSetupFileHash(filename);
+
+  if (setup_file_hash)
+  {
+    decodeSetupFileHash_ServerSetup(setup_file_hash);
+
+    freeSetupFileHash(setup_file_hash);
+  }
+
+  free(filename);
+
+  if (setup.player_uuid == NULL)
+  {
+    // player UUID does not yet exist in setup file
+    setup.player_uuid = getStringCopy(getUUID());
+    setup.player_version = 2;
+
+    SaveSetup_ServerSetup();
+  }
+}
+
 void LoadSetup_EditorCascade(void)
 {
   char *filename = getPath2(getSetupDir(), EDITORCASCADE_FILENAME);
@@ -10759,6 +10977,14 @@ void LoadSetup_EditorCascade(void)
   free(filename);
 }
 
+void LoadSetup(void)
+{
+  LoadSetup_Default();
+  LoadSetup_AutoSetup();
+  LoadSetup_ServerSetup();
+  LoadSetup_EditorCascade();
+}
+
 static void addGameControllerMappingToHash(SetupFileHash *mappings_hash,
 					   char *mapping_line)
 {
@@ -10808,7 +11034,7 @@ static void LoadSetup_ReadGameControllerMappings(SetupFileHash *mappings_hash,
   fclose(file);
 }
 
-void SaveSetup(void)
+void SaveSetup_Default(void)
 {
   char *filename = getSetupFilename();
   FILE *file;
@@ -10833,7 +11059,6 @@ 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.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])
@@ -10940,6 +11165,41 @@ void SaveSetup_AutoSetup(void)
   free(filename);
 }
 
+void SaveSetup_ServerSetup(void)
+{
+  char *filename = getPath2(getSetupDir(), SERVERSETUP_FILENAME);
+  FILE *file;
+  int i;
+
+  InitUserDataDirectory();
+
+  if (!(file = fopen(filename, MODE_WRITE)))
+  {
+    Warn("cannot write server setup file '%s'", filename);
+
+    free(filename);
+
+    return;
+  }
+
+  fprintFileHeader(file, SERVERSETUP_FILENAME);
+
+  for (i = 0; i < ARRAY_SIZE(server_setup_tokens); i++)
+  {
+    // just to make things nicer :)
+    if (server_setup_tokens[i].value == &setup.use_api_server)
+      fprintf(file, "\n");
+
+    fprintf(file, "%s\n", getSetupLine(server_setup_tokens, "", i));
+  }
+
+  fclose(file);
+
+  SetFilePermissions(filename, PERMS_PRIVATE);
+
+  free(filename);
+}
+
 void SaveSetup_EditorCascade(void)
 {
   char *filename = getPath2(getSetupDir(), EDITORCASCADE_FILENAME);
@@ -10969,6 +11229,14 @@ void SaveSetup_EditorCascade(void)
   free(filename);
 }
 
+void SaveSetup(void)
+{
+  SaveSetup_Default();
+  SaveSetup_AutoSetup();
+  SaveSetup_ServerSetup();
+  SaveSetup_EditorCascade();
+}
+
 static void SaveSetup_WriteGameControllerMappings(SetupFileHash *mappings_hash,
 						  char *filename)
 {
@@ -11329,6 +11597,18 @@ static int get_anim_action_parameter_value(char *token)
       result = -(int)key;
   }
 
+  if (result == -1)
+  {
+    if (isURL(token))
+    {
+      result = get_hash_from_key(token);	// unsigned int => int
+      result = ABS(result);			// may be negative now
+      result += (result < MAX_IMAGE_FILES ? MAX_IMAGE_FILES : 0);
+
+      setHashEntry(anim_url_hash, int2str(result, 0), token);
+    }
+  }
+
   if (result == -1)
     result = ANIM_EVENT_ACTION_NONE;
 
@@ -11381,6 +11661,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
 	      string_has_parameter(value, "pingpong")	? ANIM_PINGPONG :
 	      string_has_parameter(value, "pingpong2")	? ANIM_PINGPONG2 :
 	      string_has_parameter(value, "random")	? ANIM_RANDOM :
+	      string_has_parameter(value, "random_static") ? ANIM_RANDOM_STATIC :
 	      string_has_parameter(value, "ce_value")	? ANIM_CE_VALUE :
 	      string_has_parameter(value, "ce_score")	? ANIM_CE_SCORE :
 	      string_has_parameter(value, "ce_delay")	? ANIM_CE_DELAY :
@@ -11388,6 +11669,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type)
 	      string_has_parameter(value, "vertical")	? ANIM_VERTICAL :
 	      string_has_parameter(value, "centered")	? ANIM_CENTERED :
 	      string_has_parameter(value, "all")	? ANIM_ALL :
+	      string_has_parameter(value, "tiled")	? ANIM_TILED :
 	      ANIM_DEFAULT);
 
     if (string_has_parameter(value, "once"))
@@ -11495,14 +11777,18 @@ static int get_token_parameter_value(char *token, char *value_raw)
   return get_parameter_value(value_raw, suffix, TYPE_INTEGER);
 }
 
-void InitMenuDesignSettings_Static(void)
+void InitMenuDesignSettings_FromHash(SetupFileHash *setup_file_hash,
+				     boolean ignore_defaults)
 {
   int i;
 
-  // always start with reliable default values from static default config
   for (i = 0; image_config_vars[i].token != NULL; i++)
   {
-    char *value = getHashEntry(image_config_hash, image_config_vars[i].token);
+    char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
+
+    // (ignore definitions set to "[DEFAULT]" which are already initialized)
+    if (ignore_defaults && strEqual(value, ARG_DEFAULT))
+      continue;
 
     if (value != NULL)
       *image_config_vars[i].value =
@@ -11510,6 +11796,12 @@ void InitMenuDesignSettings_Static(void)
   }
 }
 
+void InitMenuDesignSettings_Static(void)
+{
+  // always start with reliable default values from static default config
+  InitMenuDesignSettings_FromHash(image_config_hash, FALSE);
+}
+
 static void InitMenuDesignSettings_SpecialPreProcessing(void)
 {
   int i;
@@ -12308,15 +12600,7 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
       *menu_config_players[i].value = TRUE;
 
   // read (and overwrite with) values that may be specified in config file
-  for (i = 0; image_config_vars[i].token != NULL; i++)
-  {
-    char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
-
-    // (ignore definitions set to "[DEFAULT]" which are already initialized)
-    if (value != NULL && !strEqual(value, ARG_DEFAULT))
-      *image_config_vars[i].value =
-	get_token_parameter_value(image_config_vars[i].token, value);
-  }
+  InitMenuDesignSettings_FromHash(setup_file_hash, TRUE);
 
   freeSetupFileHash(setup_file_hash);
 }
@@ -12673,6 +12957,18 @@ void LoadMusicInfo(void)
 	new = &(*new)->next;
     }
   }
+
+  // add pointers to previous list nodes
+
+  struct MusicFileInfo *node = music_file_info;
+
+  while (node != NULL)
+  {
+    if (node->next)
+      node->next->prev = node;
+
+    node = node->next;
+  }
 }
 
 static void add_helpanim_entry(int element, int action, int direction,
@@ -13018,6 +13314,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);
 
@@ -13170,8 +13471,25 @@ void CreateCollectElementImages(void)
   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);
+  char *basename_bmp = "RocksCollect.bmp";
+  char *basename_png = "RocksCollect.png";
+  char *filename_bmp = getPath2(global.create_collect_images_dir, basename_bmp);
+  char *filename_png = getPath2(global.create_collect_images_dir, basename_png);
+  int len_filename_bmp = strlen(filename_bmp);
+  int len_filename_png = strlen(filename_png);
+  int max_command_len = MAX_FILENAME_LEN + len_filename_bmp + len_filename_png;
+  char cmd_convert[max_command_len];
+
+  snprintf(cmd_convert, max_command_len, "convert \"%s\" \"%s\"",
+	   filename_bmp,
+	   filename_png);
+
+  // force using RGBA surface for destination bitmap
+  SDL_SetColorKey(dst_bitmap->surface, SET_TRANSPARENT_PIXEL,
+		  SDL_MapRGB(dst_bitmap->surface->format, 0x00, 0x00, 0x00));
+
+  dst_bitmap->surface =
+    SDL_ConvertSurfaceFormat(dst_bitmap->surface, SDL_PIXELFORMAT_ARGB8888, 0);
 
   for (i = 0; i < MAX_NUM_ELEMENTS; i++)
   {
@@ -13193,6 +13511,13 @@ void CreateCollectElementImages(void)
     BlitBitmap(src_bitmap, tmp_bitmap, src_x, src_y,
 	       tile_size, tile_size, 0, 0);
 
+    // force using RGBA surface for temporary bitmap (using transparent black)
+    SDL_SetColorKey(tmp_bitmap->surface, SET_TRANSPARENT_PIXEL,
+		    SDL_MapRGB(tmp_bitmap->surface->format, 0x00, 0x00, 0x00));
+
+    tmp_bitmap->surface =
+      SDL_ConvertSurfaceFormat(tmp_bitmap->surface, SDL_PIXELFORMAT_ARGB8888, 0);
+
     tmp_bitmap->surface_masked = tmp_bitmap->surface;
 
     for (j = 0; j < anim_frames; j++)
@@ -13213,9 +13538,9 @@ void CreateCollectElementImages(void)
 	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);
+      BlitBitmapMasked(frame_bitmap, dst_bitmap, 0, 0,
+		       frame_size_final, frame_size_final,
+		       dst_x + j * tile_size + offset, dst_y + offset);
 
       FreeBitmap(frame_bitmap);
     }
@@ -13227,11 +13552,18 @@ void CreateCollectElementImages(void)
     pos_collect_images++;
   }
 
-  if (SDL_SaveBMP(dst_bitmap->surface, filename) != 0)
-    Fail("cannot save element collecting image file '%s'", filename);
+  if (SDL_SaveBMP(dst_bitmap->surface, filename_bmp) != 0)
+    Fail("cannot save element collecting image file '%s'", filename_bmp);
 
   FreeBitmap(dst_bitmap);
 
+  Info("Converting image file from BMP to PNG ...");
+
+  if (system(cmd_convert) != 0)
+    Fail("converting image file failed");
+
+  unlink(filename_bmp);
+
   Info("Done.");
 
   CloseAllAndExit(0);