diff options
author | Gregory Montoir | 2004-12-06 20:42:11 +0000 |
---|---|---|
committer | Gregory Montoir | 2004-12-06 20:42:11 +0000 |
commit | 3fb09f9b1c36bba22b3248b37a04eb8a311d4ba0 (patch) | |
tree | b2f7961ab326c21a04512766d0bf5a66d1f18402 /queen/talk.cpp | |
parent | 24bc673b8b31bebf5b34d408a02e9d74afb560a0 (diff) | |
download | scummvm-rg350-3fb09f9b1c36bba22b3248b37a04eb8a311d4ba0.tar.gz scummvm-rg350-3fb09f9b1c36bba22b3248b37a04eb8a311d4ba0.tar.bz2 scummvm-rg350-3fb09f9b1c36bba22b3248b37a04eb8a311d4ba0.zip |
Cutaway code also handles some talking stuff... Updated this part too, to fix 'bug' #1034715
svn-id: r15996
Diffstat (limited to 'queen/talk.cpp')
-rw-r--r-- | queen/talk.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp index 13fd1924d7..fe412eafde 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -792,7 +792,7 @@ void Talk::speakSegment( segment[length] = '\0'; char voiceFileName[MAX_STRING_SIZE]; - snprintf(voiceFileName, sizeof(voiceFileName), "%s%1x", voiceFilePrefix, index + 1); + sprintf(voiceFileName, "%s%1x", voiceFilePrefix, index + 1); // FIXME - it seems the french talkie version has a useless voice file ; // the c30e_102 file is very similar to c30e_101, so there is no need to @@ -1044,6 +1044,10 @@ void Talk::getString(const byte *ptr, uint16 &offset, char *str, int maxLength, str[length] = '\0'; } offset = (offset + length + (align - 1)) & ~(align - 1); + } else { + if (str) { + str[0] = '\0'; + } } } |