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

Add an argument to look for music only in the base location

Browse Source
This commit is contained in:
Mathieu Schroeter 2018-01-31 07:10:32 +01:00
parent 7097c6708d
commit ce0fe82a02
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/event.cxx
View File

@ -3066,7 +3066,7 @@ CEvent::IsHelpHide ()
} }
std::string std::string
CEvent::GetMusicLocation (Sint32 music, std::string & format) CEvent::GetMusicLocation (Sint32 music, std::string & format, bool onlyBase)
{ {
static const std::string exts[] = {"ogg", "mid"}; static const std::string exts[] = {"ogg", "mid"};
static const Location locs[] = {LOCATION_USER, LOCATION_BASE}; static const Location locs[] = {LOCATION_USER, LOCATION_BASE};
@ -3077,6 +3077,9 @@ CEvent::GetMusicLocation (Sint32 music, std::string & format)
// Look for music in the user directory, then in the game directory. // Look for music in the user directory, then in the game directory.
for (size_t i = 0; i < countof (locs); ++i) for (size_t i = 0; i < countof (locs); ++i)
{ {
if (onlyBase && locs[i] != LOCATION_BASE)
continue;
format = exts[g_restoreMidi ? 1 : 0]; format = exts[g_restoreMidi ? 1 : 0];
auto filename = auto filename =
string_format ("music/music%.3d.%s", music - 1, format.c_str ()); string_format ("music/music%.3d.%s", music - 1, format.c_str ());

23
src/event.h
View File

@ -94,17 +94,18 @@ public:
Point GetMousePos (); Point GetMousePos ();
void void
Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * pMovie); Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * pMovie);
void SetFullScreen (bool bFullScreen); void SetFullScreen (bool bFullScreen);
Sint32 GetWorld (); Sint32 GetWorld ();
Sint32 GetPhysicalWorld (); Sint32 GetPhysicalWorld ();
Sint32 GetImageWorld (); Sint32 GetImageWorld ();
bool IsHelpHide (); bool IsHelpHide ();
std::string GetMusicLocation (Sint32 music, std::string & format); std::string
bool ChangePhase (Uint32 phase); GetMusicLocation (Sint32 music, std::string & format, bool onlyBase = false);
bool MovieToStart (); bool ChangePhase (Uint32 phase);
Uint32 GetPhase (); bool MovieToStart ();
void TryInsert (); Uint32 GetPhase ();
void TryInsert ();
Sint32 GetButtonIndex (Sint32 button); Sint32 GetButtonIndex (Sint32 button);
Sint32 GetState (Sint32 button); Sint32 GetState (Sint32 button);