[Scummvm-cvs-logs] scummvm master -> 77feb41a06ecbcee55ea857c14bb34cc5b13ff92
dreammaster
dreammaster at scummvm.org
Sun Dec 13 02:55:23 CET 2015
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:
77feb41a06 ACCESS: Fix offering items to boat captain
Commit: 77feb41a06ecbcee55ea857c14bb34cc5b13ff92
https://github.com/scummvm/scummvm/commit/77feb41a06ecbcee55ea857c14bb34cc5b13ff92
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-12-12T20:53:42-05:00
Commit Message:
ACCESS: Fix offering items to boat captain
Changed paths:
engines/access/inventory.cpp
engines/access/room.cpp
engines/access/screen.cpp
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index 0a962aa..6d1b6d8 100644
--- 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
index 9a6efd3..f54b617 100644
--- 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
index b46f31f..98e188c 100644
--- 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();
More information about the Scummvm-git-logs
mailing list