diff options
| author | Max Horn | 2003-05-01 00:04:05 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-01 00:04:05 +0000 |
| commit | 48293bd132159d73c6e2ed512e44f5f1a80b84e4 (patch) | |
| tree | 1a307a3769c5d33557fa62419e2efd2f6e943977 /scumm/script_v5.cpp | |
| parent | e3acde9f9c9cf0bfc3bd72424b70b756189bc5a3 (diff) | |
| download | scummvm-rg350-48293bd132159d73c6e2ed512e44f5f1a80b84e4.tar.gz scummvm-rg350-48293bd132159d73c6e2ed512e44f5f1a80b84e4.tar.bz2 scummvm-rg350-48293bd132159d73c6e2ed512e44f5f1a80b84e4.zip | |
various music related changes and cleanup; also modified MonkeyVGA music sync, at least the intro is much better synced now; not sure about other parts of it / other games
svn-id: r7237
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index e3bcdaa8a1..0946a18c41 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2053,7 +2053,7 @@ void Scumm_v5::o5_startScript() { } void Scumm_v5::o5_startSound() { - _vars[VAR_MUSIC_FLAG] = 0; + _vars[VAR_MUSIC_TIMER] = 0; _sound->addSoundToQueue(getVarOrDirectByte(0x80)); } @@ -2474,7 +2474,7 @@ void Scumm_v5::decodeParseString() { int delay = (uint16)getVarOrDirectWord(0x40); if (_gameId == GID_LOOM256) { - _vars[VAR_MI1_TIMER] = 0; + _vars[VAR_MUSIC_TIMER] = 0; if (offset == 0 && delay == 0) { _sound->stopCD(); } else { |