[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.93,2.94 scumm.h,1.182,1.183

[Max Horn]

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

Modified Files:
	gfx.cpp scumm.h 
Log Message:
made hasCharsetMask return a bool (fixes VC compilation warnings)

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.93
retrieving revision 2.94
diff -u -d -r2.93 -r2.94
--- gfx.cpp	12 May 2003 20:33:47 -0000	2.93
+++ gfx.cpp	12 May 2003 21:35:56 -0000	2.94
@@ -802,11 +802,11 @@
 	}
 }
 
-int Scumm::hasCharsetMask(int x, int y, int x2, int y2) {
+bool Scumm::hasCharsetMask(int x, int y, int x2, int y2) {
 	if (!_charset->_hasMask || y > gdi._mask_bottom || x > gdi._mask_right ||
 			y2 < gdi._mask_top || x2 < gdi._mask_left)
-		return 0;
-	return 1;
+		return false;
+	return true;
 }
 
 byte Scumm::isMaskActiveAt(int l, int t, int r, int b, byte *mem) {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- scumm.h	10 May 2003 21:49:58 -0000	1.182
+++ scumm.h	12 May 2003 21:35:56 -0000	1.183
@@ -1002,7 +1002,7 @@
 
 	void initCharset(int charset);
 	void restoreCharsetBg();
-	int hasCharsetMask(int x, int y, int x2, int y2);
+	bool hasCharsetMask(int x, int y, int x2, int y2);
 	void CHARSET_1();
 	void drawDescString(byte *msg);
 	byte *addMessageToStack(byte *msg);