mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-15 22:19:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of /home/fg/fgone/Aquaria_fg_clean

Browse source
This commit is contained in:
fgenesis 2012-06-14 19:07:01 +00:00
commit bfe7742965
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
BBGE/SoundManager.cpp
View file

@ -1494,14 +1494,8 @@ void loadCacheSoundsCallback (const std::string &filename, intptr_t param)
}
if (fileType==".ogg")
{
std::string f = filename;
stringToLower(f);
debugLog("trying to load sound " + f);
sm->loadSoundIntoBank(f, "", "");
debugLog("trying to load sound " + filename);
sm->loadSoundIntoBank(filename, "", "");
}
}
@ -1521,21 +1515,18 @@ Buffer SoundManager::loadSoundIntoBank(const std::string &filename, const std::s
// WARNING: local sounds should go here!
debugLog(filename);
debugLog(filename);
if (slt == SFXLOAD_LOCAL && !audioPath2.empty())
{
f = audioPath2 + filename + format;
stringToLower(f);
f = core->adjustFilenameCase(audioPath2 + filename + format);
if (!exists(f))
{
f = path + filename + format;
stringToLower(f);
f = core->adjustFilenameCase(path + filename + format);
}
}
else
{
f = path + filename + format;
stringToLower(f);
f = core->adjustFilenameCase(path + filename + format);
}
bool loop = false;
@ -1557,6 +1548,8 @@ Buffer SoundManager::loadSoundIntoBank(const std::string &filename, const std::s
return Buffer();
}
stringToLower(name);
#ifdef BBGE_BUILD_FMODEX
FMOD::Sound * sound = SoundCore::soundMap[name];