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

Enable only music choices accordingly to the available formats

Browse Source 
It fixes OdyX need #47.
This commit is contained in:
Mathieu Schroeter 2018-01-31 07:32:33 +01:00
parent e52704d937
commit fbfadb1eef
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/event.cxx
View File

@ -2075,6 +2075,10 @@ CEvent::DrawButtons ()
SetEnable (EV_BUTTON10, bEnable); SetEnable (EV_BUTTON10, bEnable);
} }
/* Check if both music formats are available */
auto ogg = this->IsBaseMusicAvailable (1, "ogg");
auto mid = this->IsBaseMusicAvailable (1, "mid");
if (m_phase == EV_PHASE_SETTINGS) if (m_phase == EV_PHASE_SETTINGS)
{ {
SetEnable (EV_BUTTON1, m_Lang != m_Languages.begin ()); SetEnable (EV_BUTTON1, m_Lang != m_Languages.begin ());
@ -2086,8 +2090,8 @@ CEvent::DrawButtons ()
SetEnable (EV_BUTTON5, !g_bFullScreen && g_zoom > 1); SetEnable (EV_BUTTON5, !g_bFullScreen && g_zoom > 1);
SetEnable (EV_BUTTON6, !g_bFullScreen && g_zoom < 2); SetEnable (EV_BUTTON6, !g_bFullScreen && g_zoom < 2);
SetEnable (EV_BUTTON7, g_restoreMidi); SetEnable (EV_BUTTON7, g_restoreMidi && mid && ogg);
SetEnable (EV_BUTTON8, !g_restoreMidi); SetEnable (EV_BUTTON8, !g_restoreMidi && mid && ogg);
} }
assert (m_index >= 0); assert (m_index >= 0);
@ -2577,7 +2581,7 @@ CEvent::DrawButtons ()
DrawText (m_pPixmap, pos, res); DrawText (m_pPixmap, pos, res);
} }
text = g_restoreMidi ? gettext ("Midi") : gettext ("Ogg"); text = (g_restoreMidi && mid) || !ogg ? gettext ("Midi") : gettext ("Ogg");
lg = GetTextWidth (text); lg = GetTextWidth (text);
pos.x = (399 + 40) - lg / 2; pos.x = (399 + 40) - lg / 2;
pos.y = 330 - 20; pos.y = 330 - 20;
@ -3065,6 +3069,15 @@ CEvent::IsHelpHide ()
return bHide; return bHide;
} }
bool
CEvent::IsBaseMusicAvailable (Sint32 music, const std::string & format)
{
std::string absolute;
auto filename =
string_format ("music/music%.3d.%s", music - 1, format.c_str ());
return FileExists (filename, absolute, LOCATION_BASE);
}
std::string std::string
CEvent::GetMusicLocation (Sint32 music, std::string & format) CEvent::GetMusicLocation (Sint32 music, std::string & format)
{ {

1
src/event.h
View File

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