clearUpperMask -> clearCharsetMask

svn-id: r8206

4 files changed, 5 insertions, 5 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index a57a9e0f2f..fc35781d74 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -457,8 +457,8 @@ void Gdi::drawStripToScreen(VirtScreen *vs, int x, int w, int t, int b) {
 	_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]);
 }
 
 /**
diff --git a/scumm/gfx.h b/scumm/gfx.h
index 7b94f3712b..c07e65d010 100644
--- a/scumm/gfx.h
+++ b/scumm/gfx.h
@@ -136,7 +136,7 @@ protected:
 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; }
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index f3c13ff44b..feb88a4ee9 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -2589,7 +2589,7 @@ void Scumm_v6::o6_kernelSetFunctions() {
 			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");
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index e5031a118e..8eba4c4d99 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -994,7 +994,7 @@ load_game:
 
 	if (_completeScreenRedraw) {
 		_completeScreenRedraw = false;
-		gdi.clearUpperMask();
+		gdi.clearCharsetMask();
 		_charset->_hasMask = false;
 		for (int i = 0; i < _maxVerbs; i++)
 			drawVerb(i, 0);