diff options
| author | Filippos Karapetis | 2015-01-26 02:11:52 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-01-26 02:11:52 +0200 |
| commit | 8f551202f6c0029773524fe4686c1147f51b4ee6 (patch) | |
| tree | 59c34ba4facb95fdc255960e0b8f32bfa5c0bbaa /engines/zvision/scripting/actions.cpp | |
| parent | 4aa6f5caeeb6283cde5f53f77fb559cfcd7ee88a (diff) | |
| parent | 568c13b11531fcfb10b53bbc84d723e6fd1d0e40 (diff) | |
| download | scummvm-rg350-8f551202f6c0029773524fe4686c1147f51b4ee6.tar.gz scummvm-rg350-8f551202f6c0029773524fe4686c1147f51b4ee6.tar.bz2 scummvm-rg350-8f551202f6c0029773524fe4686c1147f51b4ee6.zip | |
Merge pull request #568 from Marisa-Chan/master
ZVISION: Fix sound bug #6767 by making pan_track code similar to origina...
Diffstat (limited to 'engines/zvision/scripting/actions.cpp')
| -rw-r--r-- | engines/zvision/scripting/actions.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 758158817e..9a2f1d10ff 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -103,8 +103,8 @@ ActionAttenuate::ActionAttenuate(ZVision *engine, int32 slotkey, const Common::S bool ActionAttenuate::execute() { ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_key); if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) { - MusicNode *mus = (MusicNode *)fx; - mus->setVolume(255 - (abs(_attenuation) >> 7)); + MusicNodeBASE *mus = (MusicNodeBASE *)fx; + mus->setVolume(255 * (10000 - abs(_attenuation)) / 10000 ); } return true; } @@ -154,7 +154,7 @@ bool ActionCrossfade::execute() { if (_keyOne) { ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyOne); if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) { - MusicNode *mus = (MusicNode *)fx; + MusicNodeBASE *mus = (MusicNodeBASE *)fx; if (_oneStartVolume >= 0) mus->setVolume((_oneStartVolume * 255) / 100); @@ -165,7 +165,7 @@ bool ActionCrossfade::execute() { if (_keyTwo) { ScriptingEffect *fx = _engine->getScriptManager()->getSideFX(_keyTwo); if (fx && fx->getType() == ScriptingEffect::SCRIPTING_EFFECT_AUDIO) { - MusicNode *mus = (MusicNode *)fx; + MusicNodeBASE *mus = (MusicNodeBASE *)fx; if (_twoStartVolume >= 0) mus->setVolume((_twoStartVolume * 255) / 100); |