[Scummvm-cvs-logs] scummvm master -> acf63388efbfff052cf2695aa80637a1838b9e2d

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
acf63388ef NEVERHOOD: Stop the background music when showing disk player


Commit: acf63388efbfff052cf2695aa80637a1838b9e2d
    https://github.com/scummvm/scummvm/commit/acf63388efbfff052cf2695aa80637a1838b9e2d
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2014-01-05T07:20:01-08:00

Commit Message:
NEVERHOOD: Stop the background music when showing disk player

This is consistent with all other disk players in the game. Only
this one had it starting the music instead. Probably a typo.

Changed paths:
    engines/neverhood/modules/module2800.cpp



diff --git a/engines/neverhood/modules/module2800.cpp b/engines/neverhood/modules/module2800.cpp
index 8f23de3..8fe5276 100644
--- a/engines/neverhood/modules/module2800.cpp
+++ b/engines/neverhood/modules/module2800.cpp
@@ -203,7 +203,7 @@ void Module2800::createScene(int sceneNum, int which) {
 		break;
 	case 26:
 		_vm->gameState().sceneNum = 26;
-		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
+		_vm->_soundMan->stopMusic(0xD2FA4D14, 0, 2);
 		_childObject = new DiskplayerScene(_vm, this, 4);
 		break;
 	case 1001: