libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: 3DO: Further alignment between portraits and talk text

Browse Source
This commit is contained in:
Paul Gilbert 2015-09-11 21:41:10 -04:00
parent e9ae9ff4e7
commit 27e9aebbb1
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
engines/sherlock/scalpel/scalpel_talk.cpp
View File

@ -528,6 +528,11 @@ OpcodeReturn ScalpelTalk::cmdSummonWindow(const byte *&str) {
return RET_SUCCESS;
}
void ScalpelTalk::loadTalkFile(const Common::String &filename) {
Talk::loadTalkFile(filename);
_3doSpeechIndex = 0;
}
void ScalpelTalk::talkWait(const byte *&str) {
UserInterface &ui = *_vm->_ui;
bool pauseFlag = _pauseFlag;

6
engines/sherlock/scalpel/scalpel_talk.h
View File

@ -83,6 +83,12 @@ public:
ScalpelTalk(SherlockEngine *vm);
virtual ~ScalpelTalk() {}
/**
* Opens the talk file 'talk.tlk' and searches the index for the specified
* conversation. If found, the data for that conversation is loaded
*/
virtual void loadTalkFile(const Common::String &filename);
/**
* Called whenever a conversation or item script needs to be run. For standard conversations,
* it opens up a description window similar to how 'talk' does, but shows a 'reply' directly

3
engines/sherlock/scalpel/scalpel_user_interface.cpp
View File

@ -1666,9 +1666,6 @@ void ScalpelUserInterface::doTalkControl() {
sound._speechPlaying = false;
}
if (IS_3DO)
// Trigger to play 3DO movie
talk.talk3DOMovieTrigger(0);
talk.waitForMore(talk._statements[_selector]._statement.size());
if (talk._talkToAbort)

2
engines/sherlock/talk.h
View File

@ -308,7 +308,7 @@ public:
* Opens the talk file 'talk.tlk' and searches the index for the specified
* conversation. If found, the data for that conversation is loaded
*/
void loadTalkFile(const Common::String &filename);
virtual void loadTalkFile(const Common::String &filename);
/**
* Push the sequence of a background object that's an NPC that needs to be