X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=ee42c99071149d56b57ac3293f64ed5b28032cfa;hb=d9c8ce45df9d28dfe8061b67f10677d63b804f0a;hp=676ebf8aa3d9db839d3921b76032c6fadd76e2f5;hpb=74f1c3f9a5358be42791f2560660dbda81179b06;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 676ebf8a..ee42c990 100644
--- a/src/files.c
+++ b/src/files.c
@@ -114,7 +114,7 @@
 					 CONF_CONTENT_NUM_BYTES : 1)
 
 #define CONF_ELEMENT_BYTE_POS(i)	((i) * CONF_ELEMENT_NUM_BYTES)
-#define CONF_ELEMENTS_ELEMENT(b,i)     ((b[CONF_ELEMENT_BYTE_POS(i)] << 8) |  \
+#define CONF_ELEMENTS_ELEMENT(b, i)	((b[CONF_ELEMENT_BYTE_POS(i)] << 8) | \
 					(b[CONF_ELEMENT_BYTE_POS(i) + 1]))
 
 #define CONF_CONTENT_ELEMENT_POS(c,x,y)	((c) * CONF_CONTENT_NUM_ELEMENTS +    \
@@ -923,7 +923,7 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
   },
   {
     EL_MM_GRAY_BALL,			-1,
-    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(1),
+    TYPE_BOOLEAN,			CONF_VALUE_8_BIT(3),
     &li.rotate_mm_ball_content,		TRUE
   },
   {
@@ -12110,7 +12110,7 @@ static void InitMenuDesignSettings_SpecialPostProcessing(void)
       vp_playfield->width = MIN(vp_playfield->width, vp_playfield->max_width);
 
     if (vp_playfield->max_height != -1)
-      vp_playfield->height = MIN(vp_playfield->height,vp_playfield->max_height);
+      vp_playfield->height = MIN(vp_playfield->height, vp_playfield->max_height);
 
     // adjust playfield position according to specified alignment
 
@@ -12479,7 +12479,9 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     {
       { "menu.draw_xoffset.INFO",	&menu.draw_xoffset_info[i]	},
       { "menu.draw_yoffset.INFO",	&menu.draw_yoffset_info[i]	},
-      { "menu.list_size.INFO",		&menu.list_size_info[i]		}
+      { "menu.list_size.INFO",		&menu.list_size_info[i]		},
+      { "menu.list_entry_size.INFO",	&menu.list_entry_size_info[i]	},
+      { "menu.tile_size.INFO",		&menu.tile_size_info[i]		}
     };
 
     for (j = 0; j < ARRAY_SIZE(menu_config); j++)
@@ -12519,6 +12521,7 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     struct TokenIntPtrInfo menu_config[] =
     {
       { "menu.left_spacing.INFO",	&menu.left_spacing_info[i]	},
+      { "menu.middle_spacing.INFO",	&menu.middle_spacing_info[i]	},
       { "menu.right_spacing.INFO",	&menu.right_spacing_info[i]	},
       { "menu.top_spacing.INFO",	&menu.top_spacing_info[i]	},
       { "menu.bottom_spacing.INFO",	&menu.bottom_spacing_info[i]	},
@@ -12934,17 +12937,24 @@ static boolean sound_info_listed(struct MusicFileInfo *list, char *basename)
   return music_info_listed_ext(list, basename, TRUE);
 }
 
+static boolean checkLevelSetHasMusic_NoConf(void)
+{
+  int i;
+
+  for (i = leveldir_current->first_level;
+       i <= leveldir_current->last_level; i++)
+    if (levelset.music[i] == MUS_UNDEFINED)
+      return TRUE;
+
+  return FALSE;
+}
+
 void LoadMusicInfo(void)
 {
-  char *music_directory = getCustomMusicDirectory_NoConf();
   int num_music = getMusicListSize();
-  int num_music_noconf = 0;
   int num_sounds = getSoundListSize();
-  Directory *dir;
-  DirectoryEntry *dir_entry;
   struct FileInfo *music, *sound;
   struct MusicFileInfo *next, **new;
-  boolean read_music_from_directory = TRUE;
   int i;
 
   while (music_file_info != NULL)
@@ -12970,6 +12980,7 @@ void LoadMusicInfo(void)
 
   new = &music_file_info;
 
+  // get music file info for all configured music files
   for (i = 0; i < num_music; i++)
   {
     music = getMusicListEntry(i);
@@ -12993,55 +13004,31 @@ void LoadMusicInfo(void)
     }
   }
 
-  if ((dir = openDirectory(music_directory)) == NULL)
+  // if some levels have no game music configured, use unconfigured music
+  if (checkLevelSetHasMusic_NoConf())
   {
-    Warn("cannot read music directory '%s'", music_directory);
+    int num_music_noconf = getMusicListSize_NoConf();
 
-    read_music_from_directory = FALSE;
-  }
-
-  while (read_music_from_directory &&
-	 (dir_entry = readDirectory(dir)) != NULL)	// loop all entries
-  {
-    char *basename = dir_entry->basename;
-    boolean music_already_used = FALSE;
-    int i;
-
-    // skip all music files that are configured in music config file
-    for (i = 0; i < num_music; i++)
+    // get music file info for all unconfigured music files
+    for (i = 0; i < num_music_noconf; i++)
     {
-      music = getMusicListEntry(i);
+      int music_nr_noconf = MAP_NOCONF_MUSIC(i);
+      char *basename = getMusicInfoEntryFilename(music_nr_noconf);
 
-      if (music->filename == NULL)
+      if (basename == NULL)
 	continue;
 
-      if (strEqual(basename, music->filename))
+      if (!music_info_listed(music_file_info, basename))
       {
-	music_already_used = TRUE;
-	break;
-      }
-    }
-
-    if (music_already_used)
-      continue;
-
-    if (!FileIsMusic(dir_entry->filename))
-      continue;
+	*new = get_music_file_info(basename, music_nr_noconf);
 
-    if (!music_info_listed(music_file_info, basename))
-    {
-      *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf));
-
-      if (*new != NULL)
-	new = &(*new)->next;
+	if (*new != NULL)
+	  new = &(*new)->next;
+      }
     }
-
-    num_music_noconf++;
   }
 
-  if (dir != NULL)
-    closeDirectory(dir);
-
+  // get sound file info for all configured sound files
   for (i = 0; i < num_sounds; i++)
   {
     sound = getSoundListEntry(i);