[Scummvm-cvs-logs] scummvm master -> 362c99797c0f04a215618b8dae46159597a1d835

[dreammaster]

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:
362c99797c ACCESS: Fix fading in screen after cancelling Inventory screen


Commit: 362c99797c0f04a215618b8dae46159597a1d835
    https://github.com/scummvm/scummvm/commit/362c99797c0f04a215618b8dae46159597a1d835
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-01-17T10:52:46-05:00

Commit Message:
ACCESS: Fix fading in screen after cancelling Inventory screen

Changed paths:
    engines/access/inventory.cpp
    engines/access/room.cpp
    engines/access/screen.cpp
    engines/access/screen.h



diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 6d1b6d8..0a962aa 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -183,6 +183,7 @@ int InventoryManager::newDisplayInv() {
 	_invModeFlag = false;
 	events.debounceLeft();
 	_vm->_timers.restoreTimers();
+	_vm->_startup = 1;
 
 	int result = 0;
 	if (!_invRefreshFlag) {
diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f54b617..c48c7ce 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -172,14 +172,14 @@ void Room::doRoom() {
 		reloadFlag = false;
 		_vm->_startup = 8;
 		_function = FN_NONE;
-		bool fadeIn = true;
+		_vm->_screen->_fadeIn = false;
 
 		while (!_vm->shouldQuit()) {
 			_vm->_images.clear();
-			if (_vm->_startup == -1 && !fadeIn) {
+			if (_vm->_screen->_fadeIn) {
 				_vm->_events->showCursor();
 				_vm->_screen->fadeIn();
-				fadeIn = true;
+				_vm->_screen->_fadeIn = false;
 			}
 
 			// Poll for events
diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 98e188c..aa15abd 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -62,6 +62,7 @@ Screen::Screen(AccessEngine *vm) : _vm(vm) {
 	_startCycle = 0;
 	_cycleStart = 0;
 	_endCycle = 0;
+	_fadeIn = false;
 }
 
 void Screen::clearScreen() {
@@ -90,7 +91,8 @@ void Screen::setPanel(int num) {
 
 void Screen::updateScreen() {
 	if (_vm->_startup >= 0) {
-		--_vm->_startup;
+		if (--_vm->_startup == -1)
+			_fadeIn = true;
 		return;
 	}
 
diff --git a/engines/access/screen.h b/engines/access/screen.h
index 5cb8547..6fa0fe3 100644
--- a/engines/access/screen.h
+++ b/engines/access/screen.h
@@ -85,6 +85,7 @@ public:
 	int _bufferBytesWide;
 	int _vWindowLinesTall;
 	bool _screenChangeFlag;
+	bool _fadeIn;
 public:
 	virtual void copyBlock(ASurface *src, const Common::Rect &bounds);