games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Quick fix for #389.

Browse Source 
* modded music support should be redone separately
This commit is contained in:
AlexVinS 2017-11-16 17:47:52 +03:00
parent 805b5215de
commit e8a7078bb1
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
client/CMusicHandler.cpp
View File

@ -254,32 +254,27 @@ CMusicHandler::CMusicHandler():
{
listener(std::bind(&CMusicHandler::onVolumeChange, this, _1));
auto mp3Folders = CResourceHandler::get()->getFilteredFiles([](const ResourceID & id) -> bool
auto mp3files = CResourceHandler::get()->getFilteredFiles([](const ResourceID & id) -> bool
{
if (id.getType() != EResType::DIRECTORY)
if(id.getType() != EResType::MUSIC)
return false;
if (!(boost::algorithm::iends_with(id.getName(), "mp3")))
if(!boost::algorithm::istarts_with(id.getName(), "MUSIC/"))
return false;
logGlobal->trace("Found music file %s", id.getName());
return true;
});
boost::filesystem::path userDataPath = VCMIDirs::get().userDataPath();
int battleMusicID = 0;
int AIThemeID = 0;
for (ResourceID folder : mp3Folders)
for(const ResourceID & file : mp3files)
{
const boost::filesystem::directory_iterator enddir;
for (boost::filesystem::directory_iterator dir(userDataPath / folder.getName()); dir != enddir; ++dir)
{
if (is_regular(dir->status()))
{
std::string name = dir->path().filename().string();
if (boost::algorithm::istarts_with(name, "Combat"))
addEntryToSet("battle", battleMusicID++, "Music/" + name);
else if (boost::algorithm::istarts_with(name, "AITheme"))
addEntryToSet("enemy-turn", AIThemeID++, "Music/" + name);
}
}
if(boost::algorithm::istarts_with(file.getName(), "MUSIC/Combat"))
addEntryToSet("battle", battleMusicID++, file.getName());
else if(boost::algorithm::istarts_with(file.getName(), "MUSIC/AITheme"))
addEntryToSet("enemy-turn", AIThemeID++, file.getName());
}
JsonNode terrains(ResourceID("config/terrains.json"));