diff options
author | Paul Gilbert | 2018-05-30 20:12:13 -0400 |
---|---|---|
committer | Paul Gilbert | 2018-05-30 20:12:13 -0400 |
commit | 7edac197e4aa9846b71f398d9c5a4d56c5b7c34e (patch) | |
tree | 614931659b8bd272e6cef000fb1a1691e4cf93ad /engines/xeen | |
parent | d6841efd63d91750e210bce90f92b44f0e326abd (diff) | |
download | scummvm-rg350-7edac197e4aa9846b71f398d9c5a4d56c5b7c34e.tar.gz scummvm-rg350-7edac197e4aa9846b71f398d9c5a4d56c5b7c34e.tar.bz2 scummvm-rg350-7edac197e4aa9846b71f398d9c5a4d56c5b7c34e.zip |
XEEN: Correct scroll and music when signing into tavern
Diffstat (limited to 'engines/xeen')
-rw-r--r-- | engines/xeen/dialogs/dialogs_party.cpp | 2 | ||||
-rw-r--r-- | engines/xeen/locations.cpp | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/engines/xeen/dialogs/dialogs_party.cpp b/engines/xeen/dialogs/dialogs_party.cpp index 6bd54db712..cf49007f30 100644 --- a/engines/xeen/dialogs/dialogs_party.cpp +++ b/engines/xeen/dialogs/dialogs_party.cpp @@ -45,6 +45,7 @@ void PartyDialog::show(XeenEngine *vm) { void PartyDialog::execute() { EventsManager &events = *_vm->_events; + FileManager &files = *_vm->_files; Interface &intf = *_vm->_interface; Map &map = *_vm->_map; Party &party = *_vm->_party; @@ -54,6 +55,7 @@ void PartyDialog::execute() { bool modeFlag = false; int startingChar = 0; + sound.playSong(files._ccNum ? "newbrigh.m" : "inn.m"); loadButtons(); setupBackground(); diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp index 63478bab5f..7cbfc2bab3 100644 --- a/engines/xeen/locations.cpp +++ b/engines/xeen/locations.cpp @@ -572,6 +572,7 @@ Common::String TavernLocation::createLocationText(Character &ch) { } Character *TavernLocation::doOptions(Character *c) { + EventsManager &events = *g_vm->_events; Interface &intf = *g_vm->_interface; Map &map = *g_vm->_map; Party &party = *g_vm->_party; @@ -717,6 +718,15 @@ Character *TavernLocation::doOptions(Character *c) { party.addTime(1440); party._mazeId = 0; + // Say farewell + farewell(); + while (sound.isSoundPlaying()) + events.wait(1); + + // Animate closing a scroll + doScroll(true, false); + sound.stopAllAudio(); + // Show the party dialog PartyDialog::show(g_vm); |