aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorJohannes Schickel2014-06-04 01:49:31 +0200
committerJohannes Schickel2014-06-04 01:49:31 +0200
commitc281da662e0c11bf4f2f24d3346f0d55fc71112d (patch)
treeb49188b0a9e395ff8c4f548db051ce28b0c54827 /engines/scumm
parent5ab61bcea5b656ac17115f2359ffc65c5ac15df2 (diff)
downloadscummvm-rg350-c281da662e0c11bf4f2f24d3346f0d55fc71112d.tar.gz
scummvm-rg350-c281da662e0c11bf4f2f24d3346f0d55fc71112d.tar.bz2
scummvm-rg350-c281da662e0c11bf4f2f24d3346f0d55fc71112d.zip
SCUMM: Only reset rhythm state when music is stopped.
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/players/player_ad.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/players/player_ad.cpp b/engines/scumm/players/player_ad.cpp
index aa6f044340..16e03d1131 100644
--- a/engines/scumm/players/player_ad.cpp
+++ b/engines/scumm/players/player_ad.cpp
@@ -164,8 +164,6 @@ void Player_AD::stopAllSounds() {
for (int i = 0; i < ARRAYSIZE(_sfx); ++i) {
stopSfx(&_sfx[i]);
}
-
- writeReg(0xBD, 0x00);
}
int Player_AD::getMusicTimer() {
@@ -384,6 +382,10 @@ void Player_AD::stopMusic() {
noteOff(i);
}
}
+
+ // Reset rhythm state
+ writeReg(0xBD, 0x00);
+ limitHWChannels(9);
}
void Player_AD::updateMusic() {