thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
svn-id: r55148
This commit is contained in:
Nicola Mettifogo 2011-01-07 16:19:13 +00:00
parent 9dd0e0f94c
commit 31ffb39939
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/parallaction/parallaction_ns.cpp
View file

@ -351,7 +351,10 @@ void Parallaction_ns::changeLocation() {
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
@ -468,7 +471,10 @@ void Parallaction_ns::changeCharacter(const char *name) {
_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