[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.176,1.177 puzzle.cpp,1.14,1.15

Eugene Sandulenko sev at users.sourceforge.net
Tue Aug 16 06:14:17 CEST 2005


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

Modified Files:
	actor.cpp puzzle.cpp 
Log Message:
o Fix crashes on puzzle with floppy (speechless) versions
o Now hints get correct voices.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- actor.cpp	11 Aug 2005 21:39:05 -0000	1.176
+++ actor.cpp	16 Aug 2005 13:13:27 -0000	1.177
@@ -2052,7 +2052,10 @@
 	_activeSpeech.speechFlags = speechFlags;
 	_activeSpeech.actorsCount = 1;
 	_activeSpeech.actorIds[0] = 0;
-	_activeSpeech.sampleResourceId = sampleResourceId;
+	if (!(_vm->getFeatures() & GF_CD_FX))
+		_activeSpeech.sampleResourceId = -1;
+	else
+		_activeSpeech.sampleResourceId = sampleResourceId;
 	_activeSpeech.playing = false;
 	_activeSpeech.slowModeCharIndex = 0;
 	_activeSpeech.speechBox = box;

Index: puzzle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/puzzle.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- puzzle.cpp	10 Aug 2005 14:53:17 -0000	1.14
+++ puzzle.cpp	16 Aug 2005 13:13:27 -0000	1.15
@@ -608,11 +608,11 @@
 		}
 
 		if (i >= 0) {
-			char hintBuf[64];
-			const char *hintPtr = hintBuf;
-			sprintf(hintBuf, optionsStr[_lang][kROHint], pieceNames[piece]);
+			static char hintBuf[64];
+			static const char *hintPtr = hintBuf;
+			sprintf(hintBuf, optionsStr[_lang][kROHint], pieceNames[_lang][piece]);
 
-			_vm->_actor->nonActorSpeech(_hintBox, &hintPtr, 1, PUZZLE_TOOL_SOUNDS + _hintSpeaker + piece, 0);
+			_vm->_actor->nonActorSpeech(_hintBox, &hintPtr, 1, PUZZLE_TOOL_SOUNDS + _hintSpeaker + piece * 3, 0);
 		}
 		else {
 				//	If no pieces are in the wrong place





More information about the Scummvm-git-logs mailing list