libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 05:38:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch 617937 / Bug 617939 + modifications: Fix FT text masking

Browse Source 
svn-id: r5081
This commit is contained in:
James Brown 2002-10-03 07:38:03 +00:00
parent b8e5c8f76e
commit aeaad5169e
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scumm/actor.cpp
View File

@ -899,7 +899,7 @@ void Actor::drawActorCostume()
}
} else {
AkosRenderer ar(_vm);
ar.charsetmask = true;
ar.x = x - _vm->virtscr->xstart;
ar.y = y - elevation;
ar.scale_x = scalex;
@ -910,7 +910,6 @@ void Actor::drawActorCostume()
if (ar.clipping > (byte)_vm->gdi._numZBuffer)
ar.clipping = _vm->gdi._numZBuffer;
}
ar.charsetmask = _vm->_vars[_vm->VAR_CHARSET_MASK] != 0;
ar.outptr = _vm->virtscr->screenPtr + _vm->virtscr->xstart;
ar.outwidth = _vm->virtscr->width;

12
scumm/scummvm.cpp
View File

@ -374,9 +374,15 @@ int Scumm::scummLoop(int delta)
decreaseScriptDelay(delta);
_talkDelay -= delta;
if (_talkDelay < 0)
_talkDelay = 0;
// If _talkDelay is -1, that means the text should never time out.
// This is used for drawing verb texts, e.g. the Full Throttle
// dialogue choices.
if (_talkDelay != -1) {
_talkDelay -= delta;
if (_talkDelay < 0)
_talkDelay = 0;
}
processKbd();

7
scumm/string.cpp
View File

@ -560,10 +560,9 @@ void Scumm::drawString(int a)
charset._left -= charset.getStringWidth(a, buf, 0) >> 1;
}
// Full Throttle's conversation menus should definitely mask the
// background.
if (!(_features & GF_AFTER_V7))
charset._ignoreCharsetMask = 1;
// Verb text should never time out.
if (a == 4)
_talkDelay = -1;
if (!buf[0]) {
buf[0] = ' ';