[Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.61,1.62 speech.cpp,1.65,1.66

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8725

Modified Files:
	anims.cpp speech.cpp 
Log Message:
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.


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/anims.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- anims.cpp	9 Jun 2004 06:33:25 -0000	1.61
+++ anims.cpp	22 Aug 2004 14:27:57 -0000	1.62
@@ -341,7 +341,6 @@
 	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 @@
 		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;

Index: speech.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/speech.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- speech.cpp	11 Jun 2004 06:37:50 -0000	1.65
+++ speech.cpp	22 Aug 2004 14:27:57 -0000	1.66
@@ -895,19 +895,7 @@
 			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 @@
 				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);
 			}
 		}