libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-15 22:28:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more cleanup

Browse Source 
svn-id: r12264
This commit is contained in:
Max Horn 2004-01-08 21:44:03 +00:00
parent 04b002bbaa
commit 84f4a13730
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scumm/gfx.cpp
View File

@ -544,9 +544,7 @@ void ScummEngine::redrawBGStrip(int start, int num) {
void ScummEngine::restoreBG(Common::Rect rect, byte backColor) {
VirtScreen *vs;
int topline, height, width;
byte *backbuff;
bool lightsOn;
if (rect.top < 0)
rect.top = 0;
@ -559,8 +557,9 @@ void ScummEngine::restoreBG(Common::Rect rect, byte backColor) {
if (rect.left > vs->width)
return;
topline = vs->topline;
const int topline = vs->topline;
// Move rect up
rect.top -= topline;
rect.bottom -= topline;
@ -571,16 +570,18 @@ void ScummEngine::restoreBG(Common::Rect rect, byte backColor) {
int offset = rect.top * vs->width + vs->xstart + rect.left;
backbuff = vs->screenPtr + offset;
height = rect.height();
width = rect.width();
const int height = rect.height();
const int width = rect.width();
// Check whether lights are turned on or not
lightsOn = isLightOn();
if (vs->hasTwoBuffers && _currentRoom != 0 && lightsOn ) {
if (vs->hasTwoBuffers && _currentRoom != 0 && isLightOn()) {
blit(backbuff, vs->backBuf + offset, width, height);
if (vs->number == kMainVirtScreen && _charset->_hasMask && height) {
byte *mask;
// Move rect back
rect.top += topline;
rect.bottom += topline;
// Note: At first sight it may look as if this could
// be optimized to (rect.right - rect.left) / 8 and
// thus to width / 8, but that's not the case since
@ -591,8 +592,6 @@ void ScummEngine::restoreBG(Common::Rect rect, byte backColor) {
mask_width++;
mask = getMaskBuffer(rect.left, rect.top + topline, 0);
if (vs->number == kMainVirtScreen)
mask += vs->topline * gdi._numStrips;
do {
memset(mask, 0, mask_width);