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

fixed / cleaned up drawBox

Browse Source 
svn-id: r7553
This commit is contained in:
Max Horn 2003-05-15 23:44:46 +00:00
parent 9f6b1bf3a1
commit 27c093a3a6
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
scumm/script.cpp
View File

@ -498,16 +498,13 @@ int Scumm::pop() {
}
void Scumm::drawBox(int x, int y, int x2, int y2, int color) {
int top, bottom, count;
int width, height;
VirtScreen *vs;
byte *backbuff, *bgbuff;
if ((vs = findVirtScreen(y)) == NULL)
return;
top = vs->topline;
bottom = top + vs->height;
if (x > x2)
SWAP(x, x2);
@ -517,34 +514,46 @@ void Scumm::drawBox(int x, int y, int x2, int y2, int color) {
x2++;
y2++;
if (x > _screenWidth - 1)
return;
// Adjust for the topline of the VirtScreen
y -= vs->topline;
y2 -= vs->topline;
// Clip the coordinates
if (x < 0)
x = 0;
if (y < 0)
y = 0;
else if (x >= vs->width)
return;
if (x2 < 0)
return;
if (x2 > _screenWidth - 1)
x2 = _screenWidth - 1;
if (y2 > bottom - 1)
y2 = bottom - 1;
else if (x2 > vs->width)
x2 = vs->width;
updateDirtyRect(vs->number, x, x2, y - top, y2 - top, 0);
if (y < 0)
y = 0;
else if (y > vs->height)
return;
backbuff = vs->screenPtr + vs->xstart + (y - top) * _screenWidth + x;
if (y2 < 0)
return;
else if (y2 > vs->height)
y2 = vs->height;
updateDirtyRect(vs->number, x, x2, y, y2, 0);
backbuff = vs->screenPtr + vs->xstart + y * _screenWidth + x;
width = x2 - x;
height = y2 - y;
if (color == -1) {
if (vs->number != 0)
error("can only copy bg to main window");
bgbuff = getResourceAddress(rtBuffer, vs->number + 5) + vs->xstart + (y - top) * _screenWidth + x;
blit(backbuff, bgbuff, x2 - x, y2 - y);
bgbuff = getResourceAddress(rtBuffer, vs->number + 5) + vs->xstart + y * _screenWidth + x;
blit(backbuff, bgbuff, width, height);
} else {
count = y2 - y;
while (count) {
memset(backbuff, color, x2 - x);
while (height--) {
memset(backbuff, color, width);
backbuff += _screenWidth;
count--;
}
}
}