[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,2.131,2.132 gfx.h,1.36,1.37 scummvm.cpp,2.197,2.198 script_v6.cpp,1.146,1.147

[Max Horn]

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

Modified Files:
	gfx.cpp gfx.h scummvm.cpp script_v6.cpp 
Log Message:
clearUpperMask -> clearCharsetMask

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.131
retrieving revision 2.132
diff -u -d -r2.131 -r2.132
--- gfx.cpp	30 May 2003 20:13:28 -0000	2.131
+++ gfx.cpp	1 Jun 2003 01:02:34 -0000	2.132
@@ -457,8 +457,8 @@
 	_vm->_system->copy_rect(ptr, _vm->_screenWidth, x, vs->topline + t, w, height);
 }
 
-void Gdi::clearUpperMask() {
-	memset(_vm->getResourceAddress(rtBuffer, 9), 0, _imgBufOffs[1] - _imgBufOffs[0]);
+void Gdi::clearCharsetMask() {
+	memset(_vm->getResourceAddress(rtBuffer, 9), 0, _imgBufOffs[1]);
 }
 
 /**

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gfx.h	30 May 2003 20:13:29 -0000	1.36
+++ gfx.h	1 Jun 2003 01:02:35 -0000	1.37
@@ -136,7 +136,7 @@
 public:
 	void drawBitmap(const byte *ptr, VirtScreen *vs, int x, int y, const int width, const int height,
 	                int stripnr, int numstrip, byte flag);
-	void clearUpperMask();
+	void clearCharsetMask();
 
 	void disableZBuffer() { _zbufferDisabled = true; }
 	void enableZBuffer() { _zbufferDisabled = false; }

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.197
retrieving revision 2.198
diff -u -d -r2.197 -r2.198
--- scummvm.cpp	31 May 2003 17:58:15 -0000	2.197
+++ scummvm.cpp	1 Jun 2003 01:02:35 -0000	2.198
@@ -994,7 +994,7 @@
 
 	if (_completeScreenRedraw) {
 		_completeScreenRedraw = false;
-		gdi.clearUpperMask();
+		gdi.clearCharsetMask();
 		_charset->_hasMask = false;
 		for (int i = 0; i < _maxVerbs; i++)
 			drawVerb(i, 0);

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- script_v6.cpp	1 Jun 2003 00:45:08 -0000	1.146
+++ script_v6.cpp	1 Jun 2003 01:02:35 -0000	1.147
@@ -2589,7 +2589,7 @@
 			createSpecialPalette(args[1], args[2], args[3], args[4], args[5], 0, 256);
 			break;
 		case 110:
-			gdi.clearUpperMask();
+			gdi.clearCharsetMask();
 			break;
 		case 111:
 			a = derefActor(args[1], "o6_kernelSetFunctions: 111");