thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed CharsetRenderer::_mask (this was used to optimize charset mask handling). This shouldn't cause any noticable slowdowns, but allows us to get rid of two nasty hacks, and fixes bug #895355 (DIG: Subtitles sometimes stay on the screen), maybe also others

Browse source 
svn-id: r13464
This commit is contained in:
Max Horn 2004-04-04 20:20:09 +00:00
parent 749d75cdcb
commit 71bbdbfae4
5 changed files with 16 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

17
scumm/camera.cpp
View file

@ -338,23 +338,6 @@ void ScummEngine::cameraMoved() {
#else
virtscr[0].xstart = _screenStartStrip * 8;
#endif
if (_charset->_hasMask && _version > 3) {
int dx = camera._cur.x - camera._last.x;
int dy = camera._cur.y - camera._last.y;
// Fixes subtitle glitches during room scrolling in two cut scenes
// When talking to Rusty for first time
// When sleeping in straw at Blacksmith's Guild.
if ((_gameId == GID_LOOM256 || _gameId == GID_PASS) && dx)
_charset->_mask.left -= 8;
else if (dx || dy) {
_charset->_mask.left -= dx;
_charset->_mask.right -= dx;
_charset->_mask.top -= dy;
_charset->_mask.bottom -= dy;
}
}
}
void ScummEngine::panCameraTo(int x, int y) {