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

[Torbj?rn Andersson]

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

Modified Files:
	d_draw.cpp 
Log Message:
Cleanup.


Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_draw.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- d_draw.cpp	8 Sep 2003 17:18:38 -0000	1.11
+++ d_draw.cpp	8 Sep 2003 17:44:26 -0000	1.12
@@ -561,6 +561,9 @@
 		BS2_SetPalette(0, 256, tmpPal, RDPAL_INSTANT);
 
 		while (1) {
+			if (!text[textCounter])
+				break;
+
 			if (frameCounter == text[textCounter]->startFrame) {
 				EraseBackBuffer();
 				OpenTextObject(text[textCounter]);
@@ -571,9 +574,6 @@
 				CloseTextObject(text[textCounter]);
 				EraseBackBuffer();
 				textCounter++;
-
-				if (text[textCounter] == NULL)
-					break;
 			}
 
 			frameCounter++;
@@ -590,6 +590,9 @@
 		}
 
 		BS2_SetPalette(0, 256, oldPal, RDPAL_INSTANT);
+
+		if (textSurface)
+			CloseTextObject(text[textCounter]);
 	}
 
 	return(RD_OK);