TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Small fix and improvement for Jukebox path detection

Browse source
This commit is contained in:
zicodxx 2010-06-14 10:33:36 +00:00
parent 958859e7d6
commit 196a149c71
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -4,6 +4,7 @@ D1X-Rebirth Changelog
--------
include/args.h, include/physfsx.h, main/newmenu.h, main/inferno.c, main/menu.c, main/songs.c, main/songs.h, main/config.c, main/config.h, main/gameseq.c, main/digiobj.c, main/digi.h, main/game.c, main/gamecntl.c, misc/args.c, d1x.ini, arch/sdl/digi_mixer.c, arch/sdl/digi_mixer_music.c, arch/sdl/init.c, arch/sdl/jukebox.c, arch/sdl/digi.c, arch/sdl/digi_audio.c, arch/include/digi_audio.h, arch/include/digi_mixer.h, arch/include/digi_mixer_music.h, arch/include/jukebox.h: Increased SDL_mixer music abilities to play non-hmp from HOGs, having Level-music path to play, options to specify non-level tracks and added various playing order methods; Abstracted SDL_mixer- and Redbook-interfaces; Simplified program flow through all music functions
arch/include/window.h: Added missing newline at EOF
arch/sdl/jukebox.c: Small fix and improvement for Jukebox path detection
20100503
--------

23
arch/sdl/jukebox.c
View file

@ -68,13 +68,26 @@ void jukebox_load() {
strncat(GameCfg.CMLevelMusicPath, sep, PATH_MAX - 1 - strlen(GameCfg.CMLevelMusicPath));
}
PHYSFSX_getRealPath(GameCfg.CMLevelMusicPath,absolute_path);
PHYSFS_addToSearchPath(absolute_path, 0);
PHYSFS_addToSearchPath(GameCfg.CMLevelMusicPath, 0);
// as mountpoints are no option (yet), make sure only files originating from GameCfg.CMLevelMusicPath are aded to the list.
JukeboxSongs = PHYSFSX_findabsoluteFiles("", absolute_path, music_exts);
JukeboxSongs = PHYSFSX_findabsoluteFiles("", GameCfg.CMLevelMusicPath, music_exts);
if (JukeboxSongs != NULL) {
// If we do not find anything, try to see if given path is child of Searchpath
if (JukeboxSongs != NULL)
{
for (count = 0; JukeboxSongs[count]!=NULL; count++) {}
if (!count)
{
PHYSFSX_getRealPath(GameCfg.CMLevelMusicPath,absolute_path);
PHYSFS_addToSearchPath(absolute_path, 0);
JukeboxSongs = PHYSFSX_findabsoluteFiles("", absolute_path, music_exts);
}
}
count = 0;
if (JukeboxSongs != NULL)
{
for (count = 0; JukeboxSongs[count]!=NULL; count++) {}
if (count)
{