diff options
author | Gregory Montoir | 2004-08-06 11:28:33 +0000 |
---|---|---|
committer | Gregory Montoir | 2004-08-06 11:28:33 +0000 |
commit | 79f235ef269b8c01dc7dff5b43a80c755fbcdb61 (patch) | |
tree | d7e2522fc8f6527773c04395a5c6de566270a2b9 /queen/talk.cpp | |
parent | f0d7ee966b519563fb25f8ab448ecf62fb7262e6 (diff) | |
download | scummvm-rg350-79f235ef269b8c01dc7dff5b43a80c755fbcdb61.tar.gz scummvm-rg350-79f235ef269b8c01dc7dff5b43a80c755fbcdb61.tar.bz2 scummvm-rg350-79f235ef269b8c01dc7dff5b43a80c755fbcdb61.zip |
minor cleanup
svn-id: r14484
Diffstat (limited to 'queen/talk.cpp')
-rw-r--r-- | queen/talk.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/queen/talk.cpp b/queen/talk.cpp index 1d8e2fe21e..4942ee66c0 100644 --- a/queen/talk.cpp +++ b/queen/talk.cpp @@ -598,8 +598,8 @@ bool Talk::speak(const char *sentence, Person *person, const char *voiceFilePref person = &joe_person; } - //debug(6, "Sentence '%s' is said by person '%s' and voice files with prefix '%s' played", - // sentence, person->name, voiceFilePrefix); + debug(6, "Sentence '%s' is said by person '%s' and voice files with prefix '%s' played", + sentence, person->name, voiceFilePrefix); if (sentence[0] == '\0') { goto exit; @@ -658,7 +658,6 @@ exit: return personWalking; } -// cyx : there is a similar function in Cutaway, what about merging them ? int Talk::countSpaces(const char *segment) { int tmp = 0; @@ -764,7 +763,6 @@ void Talk::defaultAnimation( int bankNum) { // lines 1730-1823 in talk.c -#if 0 debug(6, "Talk::defaultAnimation(\"%s\", %s, {\"%s\", %i, ...}, %i, %i)", segment, isJoe ? "true" : "false", @@ -772,7 +770,6 @@ void Talk::defaultAnimation( parameters->state, startFrame, bankNum); -#endif if (segment[0] != 0) { @@ -859,8 +856,6 @@ void Talk::speakSegment( const char *voiceFilePrefix, int index) { - // Function SPEAK_SUB, lines 1406-1870 in talk.a - int i; char segment[MAX_STRING_SIZE]; memcpy(segment, segmentStart, length); @@ -869,9 +864,6 @@ void Talk::speakSegment( char voiceFileName[MAX_STRING_SIZE]; snprintf(voiceFileName, sizeof(voiceFileName), "%s%1x", voiceFilePrefix, index + 1); - // debug(6, "Sentence segment '%*s' is said by person '%s' and voice file '%s' is played", - // length, segment, person->name, voiceFileName); - // 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 // play it. This voice was used in room 30 (N8) when talking to Klunk. |