[Scummvm-cvs-logs] scummvm master -> 90e3e812bef2e2acf39978e09c9149023f93020a

[bluegr]

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:
90e3e812be NEVERHOOD: Stop background sounds during credits (bug #6475)


Commit: 90e3e812bef2e2acf39978e09c9149023f93020a
    https://github.com/scummvm/scummvm/commit/90e3e812bef2e2acf39978e09c9149023f93020a
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-01-01T15:54:36-08:00

Commit Message:
NEVERHOOD: Stop background sounds during credits (bug #6475)

Changed paths:
    engines/neverhood/menumodule.cpp
    engines/neverhood/neverhood.cpp



diff --git a/engines/neverhood/menumodule.cpp b/engines/neverhood/menumodule.cpp
index cf634d7..a8d88a7 100644
--- a/engines/neverhood/menumodule.cpp
+++ b/engines/neverhood/menumodule.cpp
@@ -412,7 +412,6 @@ CreditsScene::CreditsScene(NeverhoodEngine *vm, Module *parentModule, bool canAb
 
 	_ticksTime = _vm->_system->getMillis() + 202100;
 
-	_vm->toggleSoundUpdate(true);
 	_musicResource = new MusicResource(_vm);
 	_musicResource->load(0x30812225);
 	_musicResource->play(0);
@@ -422,7 +421,6 @@ CreditsScene::CreditsScene(NeverhoodEngine *vm, Module *parentModule, bool canAb
 CreditsScene::~CreditsScene() {
 	_musicResource->unload();
 	delete _musicResource;
-	_vm->toggleSoundUpdate(false);
 }
 
 void CreditsScene::update() {
diff --git a/engines/neverhood/neverhood.cpp b/engines/neverhood/neverhood.cpp
index b961bcc..af09624 100644
--- a/engines/neverhood/neverhood.cpp
+++ b/engines/neverhood/neverhood.cpp
@@ -194,10 +194,9 @@ void NeverhoodEngine::mainLoop() {
 			nextFrameTime = _screen->getNextFrameTime();
 		};
 
-		if (_updateSound) {
+		if (_updateSound)
 			_soundMan->update();
-			_audioResourceMan->updateMusic();
-		}
+		_audioResourceMan->updateMusic();
 
 		_system->updateScreen();
 		_system->delayMillis(10);