games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-01 00:45:26 +02:00
Code Issues Releases Activity

Fix regressions

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-04 14:29:02 +03:00
parent 0f88b8969b
commit 9cfcf5ea19
13 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/CMusicHandler.cpp
View File

@ -566,19 +566,23 @@ void MusicEntry::load(const AudioPath & musicURI)
music = nullptr;
}
currentName = musicURI;
if (CResourceHandler::get()->existsResource(musicURI))
currentName = musicURI;
else
currentName = musicURI.addPrefix("MUSIC/");
music = nullptr;
logGlobal->trace("Loading music file %s", musicURI.getOriginalName());
logGlobal->trace("Loading music file %s", currentName.getOriginalName());
try
{
auto musicFile = MakeSDLRWops(CResourceHandler::get()->load(musicURI));
auto musicFile = MakeSDLRWops(CResourceHandler::get()->load(currentName));
music = Mix_LoadMUS_RW(musicFile, SDL_TRUE);
}
catch(std::exception &e)
{
logGlobal->error("Failed to load music. setName=%s\tmusicURI=%s", setName, musicURI.getOriginalName());
logGlobal->error("Failed to load music. setName=%s\tmusicURI=%s", setName, currentName.getOriginalName());
logGlobal->error("Exception: %s", e.what());
}