mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 14:34:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into experimental

Browse source 
Conflicts:
	BBGE/SoundManager.cpp
	BBGE/SoundManager.h
This commit is contained in:
fgenesis 2016-06-20 02:05:42 +02:00
commit 548da72632
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BBGE/SoundManager.cpp
View file

@ -809,8 +809,6 @@ void SoundManager::setSfxChannelsVolume(float v)
bool SoundManager::playVoice(const std::string &name, SoundVoiceType svt, float vmod)
{
if (!enabled) return false;
bool checkOther = true;
@ -1435,17 +1433,11 @@ Buffer SoundManager::loadSoundIntoBank(const std::string &filename, const std::s
Buffer SoundManager::loadLocalSound(const std::string &filename)
{
Buffer b = loadSoundIntoBank(filename, localSoundPath, fileType, SFXLOAD_LOCAL);
return b;
return BBGE_AUDIO_NOCHANNEL;
return loadSoundIntoBank(filename, localSoundPath, fileType, SFXLOAD_LOCAL);
}
void SoundManager::setMusicSpeed(float speed)
{
musicChannel->setFrequency(speed);
}