aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorGregory Montoir2003-11-13 14:10:15 +0000
committerGregory Montoir2003-11-13 14:10:15 +0000
commit2f6a249970c7fad3e80b2d48425a21155ee7dbbf (patch)
treecbf0660a97ce5fe6aaabded3231b879fd6623c89 /queen
parent892492022f7d9ac31b3daf532ed8f0d5e12d9e54 (diff)
downloadscummvm-rg350-2f6a249970c7fad3e80b2d48425a21155ee7dbbf.tar.gz
scummvm-rg350-2f6a249970c7fad3e80b2d48425a21155ee7dbbf.tar.bz2
scummvm-rg350-2f6a249970c7fad3e80b2d48425a21155ee7dbbf.zip
fix 'Skip handing over the comic to Joe' issue
svn-id: r11286
Diffstat (limited to 'queen')
-rw-r--r--queen/talk.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp
index e5949d9761..646fe4946f 100644
--- a/queen/talk.cpp
+++ b/queen/talk.cpp
@@ -220,7 +220,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
if (_input->talkQuit())
break;
- speak(_talkString[selectedSentence], &person, _joeVoiceFilePrefix[selectedSentence]);
+ speak(_talkString[selectedSentence], NULL, _joeVoiceFilePrefix[selectedSentence]);
}
else {
if (person.actor->bobNum > 0) {
@@ -623,8 +623,8 @@ bool Talk::speak(const char *sentence, Person *person, const char *voiceFilePref
person = &joe_person;
}
- //debug(0, "Sentence '%s' is said by person '%s' and voice files with prefix '%s' played",
- // sentence, person->name, voiceFilePrefix);
+ debug(0, "Sentence '%s' is said by person '%s' and voice files with prefix '%s' played",
+ sentence, person->name, voiceFilePrefix);
if (sentence[0] == '\0') {
goto exit;
@@ -1137,7 +1137,6 @@ const Talk::SpeechParameters *Talk::findSpeechParameters(
int faceDirection) {
// function FIND_SACTION in queen.c
const SpeechParameters *iterator = _speechParameters;
-
if (faceDirection == DIR_RIGHT)
faceDirection = DIR_LEFT;