[Scummvm-cvs-logs] SF.net SVN: scummvm:[44351] scummvm/branches/branch-1-0-0/engines/scumm

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Fri Sep 25 14:17:58 CEST 2009


Revision: 44351
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44351&view=rev
Author:   aquadran
Date:     2009-09-25 12:17:58 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
backport commits #44267,#44274 related to bug report #2820389

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/scumm/imuse_digi/dimuse_script.cpp
    scummvm/branches/branch-1-0-0/engines/scumm/scumm_v7.h
    scummvm/branches/branch-1-0-0/engines/scumm/smush/smush_player.cpp

Modified: scummvm/branches/branch-1-0-0/engines/scumm/imuse_digi/dimuse_script.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/imuse_digi/dimuse_script.cpp	2009-09-25 12:17:08 UTC (rev 44350)
+++ scummvm/branches/branch-1-0-0/engines/scumm/imuse_digi/dimuse_script.cpp	2009-09-25 12:17:58 UTC (rev 44351)
@@ -203,6 +203,11 @@
 	debug(6, "refreshScripts()");
 
 	if (_stopingSequence) {
+		// prevent start new music, only fade out old one
+		if (_vm->isSmushActive()) {
+			fadeOutMusic(60);
+			return;
+		}
 		// small delay, it seems help for fix bug #1757010
 		if (_stopingSequence++ > 120) {
 			debug(5, "refreshScripts() Force restore music state");

Modified: scummvm/branches/branch-1-0-0/engines/scumm/scumm_v7.h
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/scumm_v7.h	2009-09-25 12:17:08 UTC (rev 44350)
+++ scummvm/branches/branch-1-0-0/engines/scumm/scumm_v7.h	2009-09-25 12:17:58 UTC (rev 44351)
@@ -97,6 +97,7 @@
 	void addSubtitleToQueue(const byte *text, const Common::Point &pos, byte color, byte charset);
 	void clearSubtitleQueue();
 	virtual void CHARSET_1();
+	bool isSmushActive() { return _smushActive; }
 
 protected:
 	virtual int runDialog(Dialog &dialog);

Modified: scummvm/branches/branch-1-0-0/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/scumm/smush/smush_player.cpp	2009-09-25 12:17:08 UTC (rev 44350)
+++ scummvm/branches/branch-1-0-0/engines/scumm/smush/smush_player.cpp	2009-09-25 12:17:58 UTC (rev 44351)
@@ -1211,6 +1211,8 @@
 			timerCallback();
 		}
 
+		_vm->scummLoop_handleSound();
+
 		if (_warpNeeded) {
 			_vm->_system->warpMouse(_warpX, _warpY);
 			_warpNeeded = false;


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