mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2283 from janisozaur/abs 

Use C++'s std::abs instead of C's to get floats
This commit is contained in:
Ted John 2015-11-11 08:10:56 +00:00
parent 1f08f092dd 2b02a04114
commit fb6a90affa
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/audio/mixer.cpp
View File

@ -26,6 +26,7 @@ extern "C" {
#include "audio.h"
}
#include "mixer.h"
#include <cmath>
Mixer gMixer;
@ -393,7 +394,7 @@ void Channel::SetPan(float pan)
if (pan < 0) {
Channel::pan = 0;
}
double decibels = (abs(Channel::pan - 0.5) * 2.0) * 100.0;
double decibels = (std::abs(Channel::pan - 0.5) * 2.0) * 100.0;
double attenuation = pow(10, decibels / 20.0);
if (Channel::pan <= 0.5) {
volume_l = 1.0;