From 4e2d3af64622098ac97b154ccc0458f83ca8b9c1 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sun, 22 Aug 2004 07:22:03 +0000 Subject: [PATCH] Original games used blastTextQueue size of 50. Hack no longer required. svn-id: r14673 --- scumm/scumm.h | 2 +- scumm/string.cpp | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/scumm/scumm.h b/scumm/scumm.h index a577de5d948..feeeae10b38 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -991,7 +991,7 @@ protected: 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(); diff --git a/scumm/string.cpp b/scumm/string.cpp index a6bc7241899..16275d3b354 100644 --- a/scumm/string.cpp +++ b/scumm/string.cpp @@ -608,23 +608,6 @@ void ScummEngine::initCharset(int charsetno) { } 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));