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

SHERLOCK: SS: Cleaned up handling of 3DO portrait playback

Browse source
This commit is contained in:
Paul Gilbert 2015-08-07 06:52:58 -04:00
parent b573e0cf7a
commit 2696be83c0
5 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/sherlock/scalpel/scalpel_user_interface.cpp
View file

@ -27,6 +27,7 @@
#include "sherlock/scalpel/scalpel_people.h"
#include "sherlock/scalpel/scalpel_saveload.h"
#include "sherlock/scalpel/scalpel_screen.h"
#include "sherlock/scalpel/scalpel_talk.h"
#include "sherlock/scalpel/settings.h"
#include "sherlock/scalpel/scalpel.h"
#include "sherlock/sherlock.h"
@ -1483,7 +1484,7 @@ void ScalpelUserInterface::doTalkControl() {
ScalpelPeople &people = *(ScalpelPeople *)_vm->_people;
ScalpelScreen &screen = *(ScalpelScreen *)_vm->_screen;
Sound &sound = *_vm->_sound;
Talk &talk = *_vm->_talk;
ScalpelTalk &talk = *(ScalpelTalk *)_vm->_talk;
Common::Point mousePos = events.mousePos();
_key = _oldKey = -1;
@ -1645,8 +1646,9 @@ void ScalpelUserInterface::doTalkControl() {
sound._speechOn = false;
}
// Trigger to play 3DO movie
talk.talk3DOMovieTrigger(0);
if (IS_3DO)
// Trigger to play 3DO movie
talk.talk3DOMovieTrigger(0);
talk.waitForMore(talk._statements[_selector]._statement.size());
if (talk._talkToAbort)