libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 12:44:02 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

cleanup

Browse Source 
svn-id: r7538
This commit is contained in:
Max Horn 2003-05-15 21:31:03 +00:00
parent 6cbfc1e342
commit 82e2d852f1
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scumm/gfx.cpp
View File

@ -885,7 +885,7 @@ void Gdi::drawBitmap(byte *ptr, VirtScreen *vs, int x, int y, const int width, c
zplane_list[0] = smap_ptr;
if (_disable_zbuffer)
if (_zbufferDisabled)
numzbuf = 0;
else if (_numZBuffer <= 1 || (_vm->_features & GF_AFTER_V2))
numzbuf = _numZBuffer;
@ -3396,10 +3396,10 @@ void Scumm::useIm01Cursor(byte *im, int w, int h) {
drawBox(0, 0, w - 1, h - 1, 0xFF);
vs->alloctwobuffers = false;
gdi._disable_zbuffer = true;
gdi.disableZBuffer();
gdi.drawBitmap(im, vs, _screenStartStrip, 0, w, h, 0, w >> 3, 0);
vs->alloctwobuffers = true;
gdi._disable_zbuffer = false;
gdi.enableZBuffer();
grabCursor(vs->screenPtr + vs->xstart, w, h);

7
scumm/gfx.h
View File

@ -114,7 +114,6 @@ public:
int _numZBuffer;
int _imgBufOffs[8];
byte _disable_zbuffer;
int32 _numStrips;
int16 _mask_top, _mask_bottom, _mask_right, _mask_left;
@ -129,6 +128,8 @@ protected:
byte _transparentColor;
uint32 _vertStripNextInc;
bool _zbufferDisabled;
/* Bitmap decompressors */
bool decompressBitmap(byte *bgbak_ptr, byte *smap_ptr, int numLinesToProcess);
void decodeStripEGA(byte *dst, byte *src, int height);
@ -162,8 +163,8 @@ public:
int stripnr, int numstrip, byte flag);
void clearUpperMask();
void disableZBuffer() { _disable_zbuffer++; }
void enableZBuffer() { _disable_zbuffer--; }
void disableZBuffer() { _zbufferDisabled = true; }
void enableZBuffer() { _zbufferDisabled = false; }
void resetBackground(int top, int bottom, int strip);

2
scumm/scumm.h
View File

@ -1009,7 +1009,7 @@ public:
void initCharset(int charset);
void restoreCharsetBg();
bool hasCharsetMask(int x, int y, int x2, int y2);
bool hasCharsetMask(int left, int top, int right, int bottom);
void CHARSET_1();
void drawString(int a);
void drawDescString(byte *msg);