diff options
| author | Torbjörn Andersson | 2004-08-22 14:28:11 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2004-08-22 14:28:11 +0000 |
| commit | e00f9f4a97dc2bcd1b8007a043396e49d0583b0d (patch) | |
| tree | c401cb8f2f05cb0a927ae905f7b0864de7cf9826 /sword2/speech.cpp | |
| parent | 759cd67de518a583804ccfb14d5fead44ef05e96 (diff) | |
| download | scummvm-rg350-e00f9f4a97dc2bcd1b8007a043396e49d0583b0d.tar.gz scummvm-rg350-e00f9f4a97dc2bcd1b8007a043396e49d0583b0d.tar.bz2 scummvm-rg350-e00f9f4a97dc2bcd1b8007a043396e49d0583b0d.zip | |
Experimental (i.e. slightly broken) code for handling compressed speech.
The equally experimental compression tool is in patch #854561.
Support for compressed music will require some restructuring first.
svn-id: r14684
Diffstat (limited to 'sword2/speech.cpp')
| -rw-r--r-- | sword2/speech.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sword2/speech.cpp b/sword2/speech.cpp index 254878fc7d..99876bc08a 100644 --- a/sword2/speech.cpp +++ b/sword2/speech.cpp @@ -895,19 +895,7 @@ int32 Logic::fnISpeak(int32 *params) { else if (speech_pan > 16) speech_pan = 16; - char speechFile[20]; - - sprintf(speechFile, "speech%d.clu", _vm->_resman->whichCd()); - - File fp; - - if (fp.open(speechFile)) - fp.close(); - else - strcpy(speechFile, "speech.clu"); - - // Load speech but don't start playing yet - uint32 rv = _vm->_sound->playCompSpeech(speechFile, params[S_WAV], 16, speech_pan); + uint32 rv = _vm->_sound->playCompSpeech(params[S_WAV], 16, speech_pan); if (rv == RD_OK) { // Ok, we've got something to play. Set it @@ -917,7 +905,7 @@ int32 Logic::fnISpeak(int32 *params) { speechRunning = true; _vm->_sound->unpauseSpeech(); } else { - debug(5, "ERROR: PlayCompSpeech(speechFile=\"%s\", wav=%d (res=%d pos=%d)) returned %.8x", speechFile, params[S_WAV], text_res, local_text, rv); + debug(5, "ERROR: PlayCompSpeech(wav=%d (res=%d pos=%d)) returned %.8x", params[S_WAV], text_res, local_text, rv); } } |