cleanup

svn-id: r7538

3 files changed, 8 insertions, 7 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 9a2a9fbf52..b299bc701f 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -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);
 
diff --git a/scumm/gfx.h b/scumm/gfx.h
index 2d54e3dec9..a0d2760a79 100644
--- a/scumm/gfx.h
+++ b/scumm/gfx.h
@@ -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);
 
diff --git a/scumm/scumm.h b/scumm/scumm.h
index ae65fa0566..907e018c24 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -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);