diff options
| author | Travis Howell | 2004-08-22 07:22:03 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-22 07:22:03 +0000 |
| commit | 4e2d3af64622098ac97b154ccc0458f83ca8b9c1 (patch) | |
| tree | 9e53e528be2e7bf3a58ed9f45e48665b4b94bd91 | |
| parent | 312200f5309e49a83ebfeb9f1fde057dd093e471 (diff) | |
| download | scummvm-rg350-4e2d3af64622098ac97b154ccc0458f83ca8b9c1.tar.gz scummvm-rg350-4e2d3af64622098ac97b154ccc0458f83ca8b9c1.tar.bz2 scummvm-rg350-4e2d3af64622098ac97b154ccc0458f83ca8b9c1.zip | |
Original games used blastTextQueue size of 50.
Hack no longer required.
svn-id: r14673
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/string.cpp | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index a577de5d94..feeeae10b3 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 a6bc724189..16275d3b35 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)); |