[Scummvm-cvs-logs] scummvm master -> b3e0c98eb283800fc6e0534c6f52be4d44349958

[urukgit]

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:
b3e0c98eb2 AVALANCHE: Repair fading at the beginning and at the end of the ghostroom scene.


Commit: b3e0c98eb283800fc6e0534c6f52be4d44349958
    https://github.com/scummvm/scummvm/commit/b3e0c98eb283800fc6e0534c6f52be4d44349958
Author: uruk (koppirnyo at gmail.com)
Date: 2014-02-09T04:17:56-08:00

Commit Message:
AVALANCHE: Repair fading at the beginning and at the end of the ghostroom scene.

Changed paths:
    engines/avalanche/ghostroom.cpp



diff --git a/engines/avalanche/ghostroom.cpp b/engines/avalanche/ghostroom.cpp
index 1047105..3217584 100644
--- a/engines/avalanche/ghostroom.cpp
+++ b/engines/avalanche/ghostroom.cpp
@@ -198,8 +198,8 @@ void GhostRoom::run() {
 	CursorMan.showMouse(false);
 	_vm->_graphics->saveScreen();
 	_vm->fadeOut();
-	_vm->fadeIn();
 	_vm->_graphics->drawFilledRectangle(Common::Rect(0, 0, 640, 200), kColorBlack); // Black out the whole screen.
+	_vm->fadeIn();
 
 	// Only load the pictures if it's our first time walking into the room.
 	// After that we simply use the already loaded images.
@@ -324,7 +324,6 @@ void GhostRoom::run() {
 		}
 
 		// Plot the Greldet:
-		
 		if (_greldetCount == 18) {
 			_greldetX = _vm->_rnd->getRandomNumber(599);
 			_greldetY = _vm->_rnd->getRandomNumber(79);
@@ -341,9 +340,11 @@ void GhostRoom::run() {
 	}
 
 	CursorMan.showMouse(true);
+	
+	_vm->fadeOut();
 	_vm->_graphics->restoreScreen();
 	_vm->_graphics->removeBackup();
-	_vm->fadeOut();
+	_vm->_animation->animLink();
 	_vm->fadeIn();
 }