diff options
| author | Paul Gilbert | 2015-09-21 21:33:28 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-09-21 21:33:28 -0400 |
| commit | 4850924b4759b2051a8905eac6298b724d4119e0 (patch) | |
| tree | b48bfc6b5cf258dec67fdf9ccda56f5b7248eefb /engines/sherlock/tattoo | |
| parent | 4a8ab68327412597b9be2b22990f52d7acaddd2e (diff) | |
| download | scummvm-rg350-4850924b4759b2051a8905eac6298b724d4119e0.tar.gz scummvm-rg350-4850924b4759b2051a8905eac6298b724d4119e0.tar.bz2 scummvm-rg350-4850924b4759b2051a8905eac6298b724d4119e0.zip | |
SHERLOCK: RT: Start next music song when a previous one finishes
Diffstat (limited to 'engines/sherlock/tattoo')
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_map.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_scene.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/engines/sherlock/tattoo/tattoo_map.cpp b/engines/sherlock/tattoo/tattoo_map.cpp index 9aa7a513f9..8438734996 100644 --- a/engines/sherlock/tattoo/tattoo_map.cpp +++ b/engines/sherlock/tattoo/tattoo_map.cpp @@ -134,6 +134,7 @@ int TattooMap::show() { screen.slamArea(screen._currentScroll.x, screen._currentScroll.y, SHERLOCK_SCREEN_WIDTH, SHERLOCK_SCREEN_WIDTH); } + music.checkSongProgress(); checkMapNames(true); if (mousePos.x < (SHERLOCK_SCREEN_WIDTH / 6)) diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp index 816220361b..ca536f3e64 100644 --- a/engines/sherlock/tattoo/tattoo_scene.cpp +++ b/engines/sherlock/tattoo/tattoo_scene.cpp @@ -340,12 +340,14 @@ void TattooScene::doBgAnimCheckCursor() { void TattooScene::doBgAnim() { TattooEngine &vm = *(TattooEngine *)_vm; Events &events = *_vm->_events; + Music &music = *_vm->_music; TattooPeople &people = *(TattooPeople *)_vm->_people; Screen &screen = *_vm->_screen; Talk &talk = *_vm->_talk; TattooUserInterface &ui = *((TattooUserInterface *)_vm->_ui); doBgAnimCheckCursor(); + music.checkSongProgress(); talk._talkToAbort = false; |