ACCESS: Fix offering items to boat captain

scummvm · Dec 13, 2015 · 77feb41 · 77feb41
1 parent 693834e
commit 77feb41
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
@@ -183,7 +183,6 @@ 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
@@ -172,12 +172,14 @@ void Room::doRoom() {
 		reloadFlag = false;
 		_vm->_startup = 8;
 		_function = FN_NONE;
+		bool fadeIn = true;
 
 		while (!_vm->shouldQuit()) {
 			_vm->_images.clear();
-			if (_vm->_startup != -1 && --_vm->_startup == 0) {
+			if (_vm->_startup == -1 && !fadeIn) {
 				_vm->_events->showCursor();
 				_vm->_screen->fadeIn();
+				fadeIn = true;
 			}
 
 			// Poll for events

diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
@@ -89,8 +89,10 @@ void Screen::setPanel(int num) {
 }
 
 void Screen::updateScreen() {
-	if (_vm->_startup > 0)
+	if (_vm->_startup >= 0) {
+		--_vm->_startup;
 		return;
+	}
 
 	// Merge the dirty rects
 	mergeDirtyRects();