if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL)
{
- Error(ERR_WARN, "cannot read sound file '%s'", filename);
+ Error(ERR_WARN, "cannot read sound file '%s': %s", filename, Mix_GetError());
free(snd_info);
return NULL;
}
if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL)
{
- Error(ERR_WARN, "cannot read music file '%s'", filename);
+ Error(ERR_WARN, "cannot read music file '%s': %s", filename, Mix_GetError());
free(mod_info);
return NULL;
}
while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */
{
char *basename = dir_entry->basename;
- char *filename = NULL;
MusicInfo *mus_info = NULL;
boolean music_already_used = FALSE;
int i;
if (draw_init_text)
DrawInitText(basename, 150, FC_YELLOW);
- filename = getPath2(music_directory, basename);
-
- if (FileIsMusic(basename))
- mus_info = Load_WAV_or_MOD(filename);
-
- free(filename);
+ if (FileIsMusic(dir_entry->filename))
+ mus_info = Load_WAV_or_MOD(dir_entry->filename);
if (mus_info)
{