[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_draw.cpp,1.13,1.14

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Tue Sep 9 08:21:03 CEST 2003


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

Modified Files:
	d_draw.cpp 
Log Message:
In PlaySmacker(), make sure there really is a text sprite to draw.


Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- d_draw.cpp	9 Sep 2003 07:01:04 -0000	1.13
+++ d_draw.cpp	9 Sep 2003 15:10:07 -0000	1.14
@@ -573,14 +573,17 @@
 
 			if (frameCounter == text[textCounter]->startFrame) {
 				EraseBackBuffer();
-				OpenTextObject(text[textCounter]);
-				DrawTextObject(text[textCounter]);
+				if (text[textCounter]->textSprite) {
+					OpenTextObject(text[textCounter]);
+					DrawTextObject(text[textCounter]);
+				}
 				if (text[textCounter]->speech)
 					debug(0, "FIXME: Play subtitle speech");
 			}
 
 			if (frameCounter == text[textCounter]->endFrame) {
-				CloseTextObject(text[textCounter]);
+				if (text[textCounter]->textSprite)
+					CloseTextObject(text[textCounter]);
 				EraseBackBuffer();
 				textCounter++;
 			}





More information about the Scummvm-git-logs mailing list