[Scummvm-cvs-logs] SF.net SVN: scummvm:[52234] scummvm/trunk/engines/scumm/player_towns.cpp

athrxx at users.sourceforge.net athrxx at users.sourceforge.net
Fri Aug 20 19:37:06 CEST 2010


Revision: 52234
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52234&view=rev
Author:   athrxx
Date:     2010-08-20 17:37:06 +0000 (Fri, 20 Aug 2010)

Log Message:
-----------
SCUMM/TOWNS: fix minor bugs

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/player_towns.cpp

Modified: scummvm/trunk/engines/scumm/player_towns.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_towns.cpp	2010-08-20 17:14:46 UTC (rev 52233)
+++ scummvm/trunk/engines/scumm/player_towns.cpp	2010-08-20 17:37:06 UTC (rev 52234)
@@ -104,7 +104,7 @@
 }
 
 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 @@
 	_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);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list