Clear the text surface when loading a saved game, otherwise any text that

was displayed before loading the game will remain.

I hope this is the correct fix.

svn-id: r17382

1 files changed, 5 insertions, 1 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index b5bdcb312a..ae5334ece7 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -887,7 +887,7 @@ void CharsetRenderer::restoreCharsetBg() {
 
 		if (vs->hasTwoBuffers) {
 			// Clean out the charset mask
-			memset(_textSurface.pixels, CHARSET_MASK_TRANSPARENCY, _textSurface.pitch * _textSurface.h);
+			clearTextSurface();
 		}
 	}
 }
@@ -896,6 +896,10 @@ void CharsetRenderer::clearCharsetMask() {
 	memset(_vm->getResourceAddress(rtBuffer, 9), 0, _vm->gdi._imgBufOffs[1]);
 }
 
+void CharsetRenderer::clearTextSurface() {
+	memset(_textSurface.pixels, CHARSET_MASK_TRANSPARENCY, _textSurface.pitch * _textSurface.h);
+}
+
 byte *ScummEngine::getMaskBuffer(int x, int y, int z) {
 	return gdi.getMaskBuffer((x + virtscr[0].xstart) / 8, y, z);
 }