[Scummvm-cvs-logs] scummvm master -> 30b5497e24965849469be0ff5c2620eef5ebfa0e

[wjp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
30b5497e24 SCI: Clarify function name


Commit: 30b5497e24965849469be0ff5c2620eef5ebfa0e
    https://github.com/scummvm/scummvm/commit/30b5497e24965849469be0ff5c2620eef5ebfa0e
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-05-03T13:45:05+02:00

Commit Message:
SCI: Clarify function name

Changed paths:
    engines/sci/engine/savegame.cpp
    engines/sci/graphics/screen.cpp
    engines/sci/graphics/screen.h



diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 8fca7ea..93b3a99 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -923,7 +923,7 @@ void gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 		g_sci->_gfxPorts->reset();
 	// clear screen
 	if (g_sci->_gfxScreen)
-		g_sci->_gfxScreen->clear();
+		g_sci->_gfxScreen->clearForRestoreGame();
 #ifdef ENABLE_SCI32
 	// Also clear any SCI32 planes/screen items currently showing so they
 	// don't show up after the load.
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index dfcb5db..ca5b5b3 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -251,8 +251,8 @@ GfxScreen::~GfxScreen() {
 	free(_displayScreen);
 }
 
-// should not used regulary, only meant for restore game
-void GfxScreen::clear() {
+// should not be used regularly; only meant for restore game
+void GfxScreen::clearForRestoreGame() {
 	// reset all screen data
 	memset(_visualScreen, 0, _pixels);
 	memset(_priorityScreen, 0, _pixels);
diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 587d2ef..1c946ef 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -76,7 +76,7 @@ public:
 	byte getColorWhite() { return _colorWhite; }
 	byte getColorDefaultVectorData() { return _colorDefaultVectorData; }
 
-	void clear();
+	void clearForRestoreGame();
 	void copyToScreen();
 	void copyFromScreen(byte *buffer);
 	void kernelSyncWithFramebuffer();