[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.101,2.102 gfx.h,1.26,1.27 scumm.h,1.189,1.190

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30923

Modified Files:
	gfx.cpp gfx.h scumm.h 
Log Message:
cleanup

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.101
retrieving revision 2.102
diff -u -d -r2.101 -r2.102
--- gfx.cpp	15 May 2003 21:09:55 -0000	2.101
+++ gfx.cpp	15 May 2003 21:31:03 -0000	2.102
@@ -885,7 +885,7 @@
 
 	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 @@
 	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);
 

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gfx.h	11 May 2003 00:28:43 -0000	1.26
+++ gfx.h	15 May 2003 21:31:03 -0000	1.27
@@ -114,7 +114,6 @@
 
 	int _numZBuffer;
 	int _imgBufOffs[8];
-	byte _disable_zbuffer;
 	int32 _numStrips;
 	int16 _mask_top, _mask_bottom, _mask_right, _mask_left;
 
@@ -129,6 +128,8 @@
 	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 @@
 	                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);
 

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- scumm.h	14 May 2003 20:37:53 -0000	1.189
+++ scumm.h	15 May 2003 21:31:03 -0000	1.190
@@ -1009,7 +1009,7 @@
 
 	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);