[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.442,1.443 string.cpp,1.243,1.244

[Travis Howell]

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

Modified Files:
	scumm.h string.cpp 
Log Message:

Original games used blastTextQueue size of 50.
Hack no longer required.


Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -d -r1.442 -r1.443
--- scumm.h	22 Aug 2004 06:16:16 -0000	1.442
+++ scumm.h	22 Aug 2004 07:22:03 -0000	1.443
@@ -991,7 +991,7 @@
 	BlastObject _blastObjectQueue[128];
 
 	int _blastTextQueuePos;
-	BlastText _blastTextQueue[35];	// FIXME - how many blast texts can there be at once? The Dig needs 33 for its end credits.
+	BlastText _blastTextQueue[50];
 
 	void enqueueText(const byte *text, int x, int y, byte color, byte charset, bool center);
 	void drawBlastTexts();

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -d -r1.243 -r1.244
--- string.cpp	21 Aug 2004 22:33:23 -0000	1.243
+++ string.cpp	22 Aug 2004 07:22:03 -0000	1.244
@@ -608,23 +608,6 @@
 }
 
 void ScummEngine::enqueueText(const byte *text, int x, int y, byte color, byte charset, bool center) {
-	// The Dig will keep enqueueing texts long after they've scrolled off
-	// the screen, eventually overflowing the blast text queue if left
-	// unchecked.
-
-	if (y < 0) {
-		byte old_charset;
-		int font_height;
-
-		old_charset = _charset->getCurID();
-		_charset->setCurID(charset);
-		font_height = _charset->getFontHeight();
-		_charset->setCurID(old_charset);
-
-		if (y <= -font_height)
-			return;
-	}
-
 	BlastText &bt = _blastTextQueue[_blastTextQueuePos++];
 	assert(_blastTextQueuePos <= ARRAYSIZE(_blastTextQueue));