backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Return the music format finally retrieved by GetMusicLocation

Browse Source 
It means that it's possible that this function returns something
different of the restoreMusic settings. It's the case when the prefered
format is not available in the directories.
This commit is contained in:
Mathieu Schroeter 2018-01-31 06:59:02 +01:00
parent daa3dbf22b
commit 7097c6708d
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/event.cxx
View File

@ -3066,20 +3066,26 @@ CEvent::IsHelpHide ()
}
std::string
CEvent::GetMusicLocation (Sint32 music)
CEvent::GetMusicLocation (Sint32 music, std::string & format)
{
static const std::string exts[] = {"ogg", "mid"};
static const Location locs[] = {LOCATION_USER, LOCATION_BASE};
std::string absolute;
format = "";
// Look for music in the user directory, then in the game directory.
for (size_t i = 0; i < countof (locs); ++i)
{
auto filename = string_format (
"music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 1 : 0].c_str ());
format = exts[g_restoreMidi ? 1 : 0];
auto filename =
string_format ("music/music%.3d.%s", music - 1, format.c_str ());
if (!FileExists (filename, absolute, locs[i]))
filename = string_format (
"music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 0 : 1].c_str ());
{
format = exts[g_restoreMidi ? 0 : 1];
filename =
string_format ("music/music%.3d.%s", music - 1, format.c_str ());
}
if (FileExists (filename, absolute, locs[i]))
break;
@ -3399,7 +3405,8 @@ CEvent::ChangePhase (Uint32 phase)
music = m_pDecor->GetMusic ();
if (music > 0)
{
auto absolute = this->GetMusicLocation (music);
std::string format;
auto absolute = this->GetMusicLocation (music, format);
m_pSound->StopMusic ();
m_pSound->PlayMusic (absolute);

2
src/event.h
View File

@ -100,7 +100,7 @@ public:
Sint32 GetPhysicalWorld ();
Sint32 GetImageWorld ();
bool IsHelpHide ();
std::string GetMusicLocation (Sint32 music);
std::string GetMusicLocation (Sint32 music, std::string & format);
bool ChangePhase (Uint32 phase);
bool MovieToStart ();
Uint32 GetPhase ();