[Scummvm-cvs-logs] scummvm master -> 7a7bf4f529f127d203a8c8f0be11389fa7b7eaeb

urukgit urukgit at users.noreply.github.com
Mon Mar 3 22:00:49 CET 2014


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:
7a7bf4f529 AVALANCHE: Replace majorRedraw() with refreshScreen().


Commit: 7a7bf4f529f127d203a8c8f0be11389fa7b7eaeb
    https://github.com/scummvm/scummvm/commit/7a7bf4f529f127d203a8c8f0be11389fa7b7eaeb
Author: uruk (koppirnyo at gmail.com)
Date: 2014-03-03T13:00:16-08:00

Commit Message:
AVALANCHE: Replace majorRedraw() with refreshScreen().

Changed paths:
    engines/avalanche/avalanche.h
    engines/avalanche/avalot.cpp
    engines/avalanche/menu.cpp
    engines/avalanche/parser.cpp



diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 9d6ab16..ecaff26 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -248,9 +248,9 @@ public:
 	void gameOver();
 	uint16 bearing(byte whichPed); // Returns the bearing from ped 'whichped' to Avvy, in degrees.
 
-	// There are two kinds of redraw: Major and Minor. Minor is what happens when you load a game, etc. Major redraws EVERYTHING.
+	// There are two kinds of redraw: Major and Minor. Minor is what happens when you load a game, etc.
+	// Major was replaced with GraphicManager::refreshScreen(), it redraws EVERYTHING.
 	void minorRedraw();
-	void majorRedraw();
 
 	void spriteRun();
 
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 20e16a5..34c5c4a 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1281,10 +1281,6 @@ void AvalancheEngine::minorRedraw() {
 	fadeIn();
 }
 
-void AvalancheEngine::majorRedraw() {
-	_graphics->refreshScreen();
-}
-
 uint16 AvalancheEngine::bearing(byte whichPed) {
 	AnimationType *avvy = _animation->_sprites[0];
 	PedType *curPed = &_peds[whichPed];
diff --git a/engines/avalanche/menu.cpp b/engines/avalanche/menu.cpp
index af3caf8..a4cecc5 100644
--- a/engines/avalanche/menu.cpp
+++ b/engines/avalanche/menu.cpp
@@ -541,7 +541,7 @@ void Menu::runMenuGame() {
 		_vm->callVerb(kVerbCodeBoss);
 		break;
 	case 2:
-		_vm->majorRedraw();
+		_vm->_graphics->refreshScreen();
 		break;
 	case 3:
 		_vm->callVerb(kVerbCodeScore);
diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp
index 5e58d1d..01067af 100644
--- a/engines/avalanche/parser.cpp
+++ b/engines/avalanche/parser.cpp
@@ -468,7 +468,7 @@ void Parser::handleFunctionKey(const Common::Event &event) {
 		break;
 	case Common::KEYCODE_F7:
 		if (event.kbd.flags & Common::KBD_CTRL)
-			_vm->majorRedraw();
+			_vm->_graphics->refreshScreen();
 		else
 			_vm->callVerb(kVerbCodeOpen);
 		break;






More information about the Scummvm-git-logs mailing list