X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=3d085a9dbe8f8f336d241978616723cbcb8ec465;hb=2b9849f490f48a8e2e5dd5aaeadf920827127d78;hp=21c21fddeebb8e0aba8fa20366e16e20251e9611;hpb=afad49f6ce2e58eeb41f680b8d05eed74455a1ab;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 21c21fdd..3d085a9d 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -591,7 +591,7 @@ static void LoadCustomMusic_NoConf(void) { static boolean draw_init_text = TRUE; // only draw at startup static char *last_music_directory = NULL; - char *music_directory = getCustomMusicDirectory(); + char *music_directory = getCustomMusicDirectory_NoConf(); Directory *dir; DirectoryEntry *dir_entry; int num_music = getMusicListSize(); @@ -741,6 +741,16 @@ static MusicInfo *getMusicInfoEntryFromMusicID(int pos) return mus_info[list_pos]; } +char *getSoundInfoEntryFilename(int pos) +{ + SoundInfo *snd_info = getSoundInfoEntryFromSoundID(pos); + + if (snd_info == NULL) + return NULL; + + return getBaseNamePtr(snd_info->source_filename); +} + char *getMusicInfoEntryFilename(int pos) { MusicInfo *mus_info = getMusicInfoEntryFromMusicID(pos);