[Scummvm-cvs-logs] SF.net SVN: scummvm:[55148] scummvm/trunk/engines/parallaction/ parallaction_ns.cpp

[peres001 at users.sourceforge.net]

Revision: 55148
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55148&view=rev
Author:   peres001
Date:     2011-01-07 16:19:13 +0000 (Fri, 07 Jan 2011)

Log Message:
-----------
PARALLACTION: keep music playing during the intro (fix bug #2879791).

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2011-01-07 16:00:08 UTC (rev 55147)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2011-01-07 16:19:13 UTC (rev 55148)
@@ -351,8 +351,11 @@
 	MouseTriState oldMouseState = _input->getMouseState();
 	_input->setMouseState(MOUSE_DISABLED);
 
-	_soundManI->playLocationMusic(location);
-
+	if (!_intro) {
+		// prevent music changes during the introduction
+		_soundManI->playLocationMusic(location);
+	}
+	
 	_input->stopHovering();
 	// this is still needed to remove the floatingLabel
 	_gfx->freeLabels();
@@ -468,8 +471,11 @@
 		_objects = _disk->loadObjects(_char.getBaseName());
 		_objectsNames = _disk->loadTable(_char.getBaseName());
 
-		_soundManI->playCharacterMusic(_char.getBaseName());
-
+		if (!_intro) {
+			// prevent music changes during the introduction
+			_soundManI->playCharacterMusic(_char.getBaseName());
+		}
+			
 		// The original engine used to reload 'common' only on loadgames. We are reloading here since 'common'
 		// contains character specific stuff. This causes crashes like bug #1816899, because parseLocation tries
 		// to reload scripts but the data archive selected is occasionally wrong. This has been solved by having


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