aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-07-20 01:09:42 +0000
committerMax Horn2003-07-20 01:09:42 +0000
commita6afa09161939430a872fda58f2580a2f74d7d08 (patch)
treee009c578cca423f1b5a00c5e9c2694aba2e38e8e
parent2ec582535fa77daca28e9c1359b438dc082ed1bd (diff)
downloadscummvm-rg350-a6afa09161939430a872fda58f2580a2f74d7d08.tar.gz
scummvm-rg350-a6afa09161939430a872fda58f2580a2f74d7d08.tar.bz2
scummvm-rg350-a6afa09161939430a872fda58f2580a2f74d7d08.zip
fix for bug #758542
svn-id: r9088
-rw-r--r--scumm/scummvm.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 2c690023ac..c99f57c3a2 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1624,13 +1624,13 @@ void Scumm::processKbd() {
_videoFinished = true;
} else
abortCutscene();
- } else if (_lastKeyHit == saveloadkey && _currentRoom != 0) {
- if (VAR_SAVELOAD_SCRIPT != 0xFF)
+ } else if (_lastKeyHit == saveloadkey) {
+ if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
saveloadDialog(); // Display NewGui
- if (VAR_SAVELOAD_SCRIPT != 0xFF)
+ if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);
return;
} else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) {