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

Remove unnecessary tests for current_music_type

Browse source 
If the type is not None, an earlier statement will have already
returned.  Thus, the type can be assumed to be None if these test
statements are reached.
This commit is contained in:
Kp 2022-03-19 22:55:58 +00:00
parent d09d30e173
commit d34f7b2ad9
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/arch/sdl/digi_mixer_music.cpp
View file

@ -166,7 +166,6 @@ int mix_play_file(const char *filename, int loop, void (*const entry_hook_finish
}
// try loading music via given filename
if (current_music_type == CurrentMusicType::None)
{
current_music_type = load_mus_file(filename, loop, hook_finished_track);
if (current_music_type != CurrentMusicType::None)
@ -175,7 +174,7 @@ int mix_play_file(const char *filename, int loop, void (*const entry_hook_finish
// allow the shell convention tilde character to mean the user's home folder
// chiefly used for default jukebox level song music referenced in 'descent.m3u' for Mac OS X
if (current_music_type == CurrentMusicType::None && *filename == '~')
if (*filename == '~')
{
const auto sep = PHYSFS_getDirSeparator();
const auto lensep = strlen(sep);
@ -189,16 +188,14 @@ int mix_play_file(const char *filename, int loop, void (*const entry_hook_finish
}
// no luck. so it might be in Searchpath. So try to build absolute path
if (current_music_type == CurrentMusicType::None)
if (PHYSFSX_getRealPath(filename, full_path))
{
PHYSFSX_getRealPath(filename, full_path);
current_music_type = load_mus_file(full_path.data(), loop, hook_finished_track);
if (current_music_type != CurrentMusicType::None)
return 1;
}
// still nothin'? Let's open via PhysFS in case it's located inside an archive
if (current_music_type == CurrentMusicType::None)
{
if (RAIIPHYSFS_File filehandle{PHYSFS_openRead(filename)})
{