diff options
| author | Paweł Kołodziejski | 2006-02-23 18:11:22 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2006-02-23 18:11:22 +0000 |
| commit | bb03e035618801eaddf77490fac0388077a400f3 (patch) | |
| tree | b8dd1a63dd268bca4d51e510ed9cd6f468bb378a /sound/softsynth/mt32 | |
| parent | bd28334650ad49b5bb6c6e2a187841690585d9d6 (diff) | |
| download | scummvm-rg350-bb03e035618801eaddf77490fac0388077a400f3.tar.gz scummvm-rg350-bb03e035618801eaddf77490fac0388077a400f3.tar.bz2 scummvm-rg350-bb03e035618801eaddf77490fac0388077a400f3.zip | |
fixed warnings for msvc7
svn-id: r20831
Diffstat (limited to 'sound/softsynth/mt32')
| -rw-r--r-- | sound/softsynth/mt32/tables.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/softsynth/mt32/tables.cpp b/sound/softsynth/mt32/tables.cpp index 7ed55ca4ee..df7a90bd73 100644 --- a/sound/softsynth/mt32/tables.cpp +++ b/sound/softsynth/mt32/tables.cpp @@ -171,7 +171,7 @@ void Tables::initEnvelopes(float samplerate) { if (elf == 0) { envDeltaMaxTime[lf] = 63; } else { - float cap = 11.0f * log(elf) + 64; + float cap = 11.0f * (float)log(elf) + 64; if (cap > 100.0f) { cap = 100.0f; } @@ -335,7 +335,7 @@ void Tables::initMT32ConstantTables(Synth *synth) { tlf = (float)lf - padjtable[depti]; if (tlf < 0) tlf = 0; - lfp = exp(0.713619942f * tlf) / 407.4945111f; + lfp = (float)exp(0.713619942f * tlf) / 407.4945111f; if (depat < 50) finalval = 4096.0f * powf(2, -lfp); @@ -410,7 +410,7 @@ void Tables::initMT32ConstantTables(Synth *synth) { //amplog = pow(1.431817011, filval) / FLOAT_PI; amplog = powf(1.531817011f, filval) / FLOAT_PI; dval = (128.0f - (float)distval) / 128.0f; - amplog = exp(amplog); + amplog = (float)exp(amplog); dval = powf(amplog,dval)/amplog; if (lf < 8) { tvfBiasMult[lf][distval] = (int)(dval * 256.0f); |