aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics
diff options
context:
space:
mode:
authorColin Snover2017-02-04 12:09:31 -0600
committerColin Snover2017-04-22 13:01:35 -0500
commitc8486395fab2d34b688c47a941a8a0c79cf164d1 (patch)
tree487d56d06ad7348b7ac5d795c11a669c02a30296 /engines/sci/graphics
parentec12c5a342519c51a1db521111ee19d4a56970f6 (diff)
downloadscummvm-rg350-c8486395fab2d34b688c47a941a8a0c79cf164d1.tar.gz
scummvm-rg350-c8486395fab2d34b688c47a941a8a0c79cf164d1.tar.bz2
scummvm-rg350-c8486395fab2d34b688c47a941a8a0c79cf164d1.zip
SCI: Clean up unnecessary delayed restore flags
_delayedRestoreGame is always set and cleared at the same time as _delayedRestoreGameId, and _delayedRestoreFromLauncher is written but never read.
Diffstat (limited to 'engines/sci/graphics')
-rw-r--r--engines/sci/graphics/portrait.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/graphics/portrait.cpp b/engines/sci/graphics/portrait.cpp
index 675883e6d3..6b66ac50e4 100644
--- a/engines/sci/graphics/portrait.cpp
+++ b/engines/sci/graphics/portrait.cpp
@@ -306,7 +306,7 @@ void Portrait::doit(Common::Point position, uint16 resourceId, uint16 noun, uint
if (curEvent.type == SCI_EVENT_MOUSE_PRESS ||
(curEvent.type == SCI_EVENT_KEYBOARD && curEvent.character == SCI_KEY_ESC) ||
g_sci->getEngineState()->abortScriptProcessing == kAbortQuitGame ||
- g_sci->getEngineState()->_delayedRestoreGame)
+ g_sci->getEngineState()->_delayedRestoreGameId != -1)
userAbort = true;
curPosition = _audio->getAudioPosition();
} while ((curPosition != -1) && (curPosition < timerPosition) && (!userAbort));