X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=c484aceed3b0499363ebea86578bacf4ea235258;hb=cf80d28b092588f54b9fb7313ee58ef6abf507f6;hp=47dfe11972294618b3aaa16a27516a5242f7e69d;hpb=99000ca8c9400bbcbc92a8f65669840242875f47;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 47dfe119..c484acee 100644
--- a/src/files.c
+++ b/src/files.c
@@ -12345,6 +12345,30 @@ static void InitMenuDesignSettings_SpecialPostProcessing_AfterGraphics(void)
   }
 }
 
+static void InitMenuDesignSettings_PreviewPlayers_FromHash(SetupFileHash *hash)
+{
+
+  // special case: check if network and preview player positions are redefined,
+  // to compare this later against the main menu level preview being redefined
+  struct TokenIntPtrInfo menu_config_players[] =
+  {
+    { "main.network_players.x",	&menu.main.network_players.redefined	},
+    { "main.network_players.y",	&menu.main.network_players.redefined	},
+    { "main.preview_players.x",	&menu.main.preview_players.redefined	},
+    { "main.preview_players.y",	&menu.main.preview_players.redefined	},
+    { "preview.x",		&preview.redefined			},
+    { "preview.y",		&preview.redefined			}
+  };
+  int i;
+
+  for (i = 0; i < ARRAY_SIZE(menu_config_players); i++)
+    *menu_config_players[i].value = FALSE;
+
+  for (i = 0; i < ARRAY_SIZE(menu_config_players); i++)
+    if (getHashEntry(hash, menu_config_players[i].token) != NULL)
+      *menu_config_players[i].value = TRUE;
+}
+
 static void LoadMenuDesignSettingsFromFilename(char *filename)
 {
   static struct TitleFadingInfo tfi;
@@ -12686,24 +12710,8 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     }
   }
 
-  // special case: check if network and preview player positions are redefined,
-  // to compare this later against the main menu level preview being redefined
-  struct TokenIntPtrInfo menu_config_players[] =
-  {
-    { "main.network_players.x",	&menu.main.network_players.redefined	},
-    { "main.network_players.y",	&menu.main.network_players.redefined	},
-    { "main.preview_players.x",	&menu.main.preview_players.redefined	},
-    { "main.preview_players.y",	&menu.main.preview_players.redefined	},
-    { "preview.x",		&preview.redefined			},
-    { "preview.y",		&preview.redefined			}
-  };
-
-  for (i = 0; i < ARRAY_SIZE(menu_config_players); i++)
-    *menu_config_players[i].value = FALSE;
-
-  for (i = 0; i < ARRAY_SIZE(menu_config_players); i++)
-    if (getHashEntry(setup_file_hash, menu_config_players[i].token) != NULL)
-      *menu_config_players[i].value = TRUE;
+  // special case: check if network and preview player positions are redefined
+  InitMenuDesignSettings_PreviewPlayers_FromHash(setup_file_hash);
 
   // read (and overwrite with) values that may be specified in config file
   InitMenuDesignSettings_FromHash(setup_file_hash, TRUE);
@@ -12839,11 +12847,13 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music,
     { "artist_header",	&tmp_music_file_info.artist_header	},
     { "album_header",	&tmp_music_file_info.album_header	},
     { "year_header",	&tmp_music_file_info.year_header	},
+    { "played_header",	&tmp_music_file_info.played_header	},
 
     { "title",		&tmp_music_file_info.title		},
     { "artist",		&tmp_music_file_info.artist		},
     { "album",		&tmp_music_file_info.album		},
     { "year",		&tmp_music_file_info.year		},
+    { "played",		&tmp_music_file_info.played		},
 
     { NULL,		NULL					},
   };
@@ -12957,11 +12967,13 @@ void LoadMusicInfo(void)
     checked_free(music_file_info->artist_header);
     checked_free(music_file_info->album_header);
     checked_free(music_file_info->year_header);
+    checked_free(music_file_info->played_header);
 
     checked_free(music_file_info->title);
     checked_free(music_file_info->artist);
     checked_free(music_file_info->album);
     checked_free(music_file_info->year);
+    checked_free(music_file_info->played);
 
     free(music_file_info);
 
@@ -12981,13 +12993,17 @@ void LoadMusicInfo(void)
       // get music file info for configured level music
       music_nr = levelset.music[i];
     }
-    else
+    else if (num_music_noconf > 0)
     {
       // get music file info for unconfigured level music
       int level_pos = i - leveldir_current->first_level;
 
       music_nr = MAP_NOCONF_MUSIC(level_pos % num_music_noconf);
     }
+    else
+    {
+      continue;
+    }
 
     char *basename = getMusicInfoEntryFilename(music_nr);