From f7314a1e5638139779dad4f8516d223a4d654ae0 Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Fri, 20 Aug 2010 17:37:06 +0000
Subject: SCUMM/TOWNS: fix minor bugs

svn-id: r52234
---
 engines/scumm/player_towns.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/scumm')

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);
 }
-- 
cgit v1.2.3