aboutsummaryrefslogtreecommitdiff
path: root/sword2/anims.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-08-22 14:28:11 +0000
committerTorbjörn Andersson2004-08-22 14:28:11 +0000
commite00f9f4a97dc2bcd1b8007a043396e49d0583b0d (patch)
treec401cb8f2f05cb0a927ae905f7b0864de7cf9826 /sword2/anims.cpp
parent759cd67de518a583804ccfb14d5fead44ef05e96 (diff)
downloadscummvm-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/anims.cpp')
-rw-r--r--sword2/anims.cpp18
1 files changed, 1 insertions, 17 deletions
diff --git a/sword2/anims.cpp b/sword2/anims.cpp
index 685d922a02..6d2a89ab36 100644
--- a/sword2/anims.cpp
+++ b/sword2/anims.cpp
@@ -341,7 +341,6 @@ void Logic::createSequenceSpeech(MovieTextObject *sequenceText[]) {
byte *text;
uint32 wavId; // ie. offical text number (actor text number)
bool speechRunning;
- char speechFile[256];
// for each sequence text line that's been logged
for (line = 0; line < _sequenceTextLines; line++) {
@@ -375,22 +374,7 @@ void Logic::createSequenceSpeech(MovieTextObject *sequenceText[]) {
sequenceText[line]->speech = NULL;
if (!_vm->_sound->isSpeechMute()) {
- // speech is selected, so try that first
-
- // set up path to speech cluster
- // first checking if we have speech1.clu or
- // speech2.clu in current directory (for translators
- // to test)
-
- File fp;
-
- sprintf(speechFile, "speech%d.clu", _vm->_resman->whichCd());
- if (fp.open(speechFile))
- fp.close();
- else
- strcpy(speechFile, "speech.clu");
-
- _sequenceTextList[line].speechBufferSize = _vm->_sound->preFetchCompSpeech(speechFile, wavId, &_sequenceTextList[line].speech_mem);
+ _sequenceTextList[line].speechBufferSize = _vm->_sound->preFetchCompSpeech(wavId, &_sequenceTextList[line].speech_mem);
if (_sequenceTextList[line].speechBufferSize) {
// ok, we've got speech!
speechRunning = true;