diff options
| author | Jamieson Christian | 2003-05-24 16:00:18 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-05-24 16:00:18 +0000 |
| commit | 0ffc4fe7da881e2bbe7b99103f253ff1fd102ada (patch) | |
| tree | 666cd32bb108a1f1283f5b5311d25e2a8486c9f4 | |
| parent | 84195fe444fefcc115dcbe30f6f382f36a190e2f (diff) | |
| download | scummvm-rg350-0ffc4fe7da881e2bbe7b99103f253ff1fd102ada.tar.gz scummvm-rg350-0ffc4fe7da881e2bbe7b99103f253ff1fd102ada.tar.bz2 scummvm-rg350-0ffc4fe7da881e2bbe7b99103f253ff1fd102ada.zip | |
Fix for bug [742688] FOA: Missing music at Sophia's lecture.
Added check for 0-length parameter fades, just in case.
svn-id: r7887
| -rw-r--r-- | scumm/imuse_player.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scumm/imuse_player.cpp b/scumm/imuse_player.cpp index 42cb05bc6f..d88a6e5d2f 100644 --- a/scumm/imuse_player.cpp +++ b/scumm/imuse_player.cpp @@ -1063,7 +1063,10 @@ int Player::addParameterFader (int param, int target, int time) { best->param = param; best->start = start; best->end = target; - best->total_time = (uint32) time * 10000; + if (!time) + best->total_time = 1; + else + best->total_time = (uint32) time * 10000; best->current_time = 0; } else { warning ("IMuse Player %d: Out of parameter faders", _id); @@ -1091,7 +1094,7 @@ void Player::transitionParameters() { switch (ptr->param) { case ParameterFader::pfVolume: // Volume. - if (!value) { + if (!value && !ptr->end) { clear(); return; } |