[Scummvm-cvs-logs] SF.net SVN: scummvm:[45291] scummvm/branches/branch-1-0-0/engines/sword1/ control.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 45291
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45291&view=rev
Author:   eriktorbjorn
Date:     2009-10-20 20:16:02 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
Backported fix for music regression introduced when adding support for looping
background sounds.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/sword1/control.cpp

Modified: scummvm/branches/branch-1-0-0/engines/sword1/control.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/sword1/control.cpp	2009-10-20 20:15:13 UTC (rev 45290)
+++ scummvm/branches/branch-1-0-0/engines/sword1/control.cpp	2009-10-20 20:16:02 UTC (rev 45291)
@@ -416,10 +416,9 @@
 	_system->copyRectToScreen(_screenBuf, 640, 0, 0, 640, 480);
 	free(_screenBuf);
 	_mouse->controlPanel(false);
-	if (retVal == CONTROL_NOTHING_DONE) {
-		_music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1);
-		_sound->newScreen(Logic::_scriptVars[SCREEN]);
-	}
+	// Can also be used to end the control panel music.
+	_music->startMusic(Logic::_scriptVars[CURRENT_MUSIC], 1);
+	_sound->newScreen(Logic::_scriptVars[SCREEN]);
 	_panelShown = false;
 	return retVal;
 }


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