immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Adjusted sound volume to game settings 

* Added fabs to remove logs about pitch having negative values
dev-ui
erihel 2013-03-14 23:03:03 +01:00
parent 6c783b9033
commit 9f5bef030d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sound/oalsound/alsound.cpp
View File

@ -136,7 +136,7 @@ void ALSound::SetMusicVolume(int volume)
{ {
mMusicVolume = MIN(static_cast<float>(volume) / MAXVOLUME, 1.0f); mMusicVolume = MIN(static_cast<float>(volume) / MAXVOLUME, 1.0f);
if (mCurrentMusic) { if (mCurrentMusic) {
mCurrentMusic->SetVolume(mMusicVolume); mCurrentMusic->SetVolume(mMusicVolume * mAudioVolume);
} }
} }
@ -318,7 +318,7 @@ int ALSound::Play(Sound sound, Math::Vector pos, float amplitude, float frequenc
Position(channel, pos); Position(channel, pos);
// setting initial values // setting initial values
mChannels[channel]->SetStartAmplitude(amplitude * mAudioVolume); mChannels[channel]->SetStartAmplitude(amplitude);
mChannels[channel]->SetStartFrequency(frequency); mChannels[channel]->SetStartFrequency(frequency);
mChannels[channel]->SetChangeFrequency(1.0f); mChannels[channel]->SetChangeFrequency(1.0f);
mChannels[channel]->ResetOper(); mChannels[channel]->ResetOper();
@ -434,7 +434,7 @@ bool ALSound::MuteAll(bool bMute)
volume = mAudioVolume; volume = mAudioVolume;
for (auto channel : mChannels) { for (auto channel : mChannels) {
channel.second->SetVolume(volume); channel.second->SetVolume(volume * mAudioVolume);
} }
return true; return true;
@ -508,7 +508,7 @@ bool ALSound::PlayMusic(int rank, bool bRepeat)
GetLogger()->Debug("Music loaded from cache\n"); GetLogger()->Debug("Music loaded from cache\n");
mCurrentMusic->SetBuffer(music); mCurrentMusic->SetBuffer(music);
mCurrentMusic->SetVolume(mMusicVolume); mCurrentMusic->SetVolume(mMusicVolume * mAudioVolume);
mCurrentMusic->SetLoop(bRepeat); mCurrentMusic->SetLoop(bRepeat);
mCurrentMusic->Play(); mCurrentMusic->Play();
return true; return true;
@ -533,7 +533,7 @@ bool ALSound::PlayMusic(int rank, bool bRepeat)
mMusicCache[rank] = buffer; mMusicCache[rank] = buffer;
} }
mCurrentMusic->SetVolume(mMusicVolume); mCurrentMusic->SetVolume(mMusicVolume * mAudioVolume);
mCurrentMusic->SetLoop(bRepeat); mCurrentMusic->SetLoop(bRepeat);
mCurrentMusic->Play(); mCurrentMusic->Play();

2
src/sound/oalsound/channel.cpp
View File

@ -94,7 +94,7 @@ bool Channel::AdjustFrequency(float freq)
if (!mReady || mBuffer == nullptr) if (!mReady || mBuffer == nullptr)
return false; return false;
return SetFrequency(mInitFrequency + freq); return SetFrequency(mInitFrequency + fabs(freq));
} }