aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFlorian Kagerer2010-08-20 17:37:06 +0000
committerFlorian Kagerer2010-08-20 17:37:06 +0000
commitf7314a1e5638139779dad4f8516d223a4d654ae0 (patch)
treee2f4192a82b001b7d43a49df2d517201b73cfd0b /engines
parent5dae3780a4640231a77ecbf524f57a3888e5d752 (diff)
downloadscummvm-rg350-f7314a1e5638139779dad4f8516d223a4d654ae0.tar.gz
scummvm-rg350-f7314a1e5638139779dad4f8516d223a4d654ae0.tar.bz2
scummvm-rg350-f7314a1e5638139779dad4f8516d223a4d654ae0.zip
SCUMM/TOWNS: fix minor bugs
svn-id: r52234
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/player_towns.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/scumm/player_towns.cpp b/engines/scumm/player_towns.cpp
index ab1b1ed585..871bd67546 100644
--- a/engines/scumm/player_towns.cpp
+++ b/engines/scumm/player_towns.cpp
@@ -104,7 +104,7 @@ void Player_Towns::startSound(int sound) {
}
void Player_Towns::stopSound(int sound) {
- if (sound != 0 && sound == _cdaCurrentSound) {
+ if (sound == 0 || sound == _cdaCurrentSound) {
_cdaCurrentSound = 0;
_vm->_sound->stopCD();
_vm->_sound->stopCDTimer();
@@ -124,10 +124,9 @@ void Player_Towns::stopAllSounds() {
_vm->_sound->stopCD();
_vm->_sound->stopCDTimer();
- // Loom disasm seems to stop only CD audio and PCM sounds here
- /*_eupCurrentSound = 0;
+ _eupCurrentSound = 0;
_eupLooping = false;
- _driver->stopParser();*/
+ _driver->stopParser();
stopPcmTrack(0);
}