[Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.11,1.12

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv17320

Modified Files:
	anims.cpp 
Log Message:
Added some code to display the subtitles for the Smacker movies, when
available, since they are separate from the Smacker files themselves.

Next step will be to play the voice-over sounds as well, and to make sure
subtitles settings etc. are taken into account (if they aren't already).


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- anims.cpp	24 Aug 2003 12:13:03 -0000	1.11
+++ anims.cpp	8 Sep 2003 17:18:38 -0000	1.12
@@ -841,7 +841,7 @@
 	FN_stop_music(NULL);	// don't want to carry on streaming game music when smacker starts!
 	g_sword2->_sound->PauseFxForSequence();	// pause sfx during sequence, except the one used for lead-in music
 
-	if (sequenceTextLines)	// if we have some text to accompany this sequence
+	if (sequenceTextLines && g_sword2->_gameId == GID_SWORD2)	// if we have some text to accompany this sequence
 		rv = PlaySmacker(filename, sequenceSpeechArray, leadOut);
 	else
 		rv = PlaySmacker(filename, NULL, leadOut);