aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/scalpel
diff options
context:
space:
mode:
authorPaul Gilbert2015-08-07 22:20:03 -0400
committerPaul Gilbert2015-08-07 22:20:03 -0400
commit62406c81b700bdf15451bc863be5fbf6e4cbd841 (patch)
treeca7300fd6c8b0ec42c1a0b224f4c850a5dc53c3c /engines/sherlock/scalpel
parent4c8b2f1235a7092c539c9b5bc8eb68cbab45ab1c (diff)
downloadscummvm-rg350-62406c81b700bdf15451bc863be5fbf6e4cbd841.tar.gz
scummvm-rg350-62406c81b700bdf15451bc863be5fbf6e4cbd841.tar.bz2
scummvm-rg350-62406c81b700bdf15451bc863be5fbf6e4cbd841.zip
SHERLOCK: RT: Fix display when characters have nothing to say
Diffstat (limited to 'engines/sherlock/scalpel')
-rw-r--r--engines/sherlock/scalpel/scalpel_talk.cpp4
-rw-r--r--engines/sherlock/scalpel/scalpel_talk.h6
2 files changed, 9 insertions, 1 deletions
diff --git a/engines/sherlock/scalpel/scalpel_talk.cpp b/engines/sherlock/scalpel/scalpel_talk.cpp
index 8261304675..80e9b79364 100644
--- a/engines/sherlock/scalpel/scalpel_talk.cpp
+++ b/engines/sherlock/scalpel/scalpel_talk.cpp
@@ -537,6 +537,10 @@ void ScalpelTalk::talkWait(const byte *&str) {
}
}
+void ScalpelTalk::nothingToSay() {
+ error("Character had no talk options available");
+}
+
void ScalpelTalk::switchSpeaker(int subIndex) {
// If it's the 3DO, pass on to start the actor's conversation movie
if (IS_3DO)
diff --git a/engines/sherlock/scalpel/scalpel_talk.h b/engines/sherlock/scalpel/scalpel_talk.h
index 3ae36336df..7ef67050d0 100644
--- a/engines/sherlock/scalpel/scalpel_talk.h
+++ b/engines/sherlock/scalpel/scalpel_talk.h
@@ -63,13 +63,17 @@ protected:
*/
virtual void talkWait(const byte *&str);
-
/**
* Called when the active speaker is switched
*/
virtual void switchSpeaker(int subIndex);
/**
+ * Called when a character being spoken to has no talk options to display
+ */
+ virtual void nothingToSay();
+
+ /**
* Show the talk display
*/
virtual void showTalk();