aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
authorTravis Howell2003-12-12 01:31:02 +0000
committerTravis Howell2003-12-12 01:31:02 +0000
commit48440c369770552f80a5f1adf14f756819dbaa56 (patch)
tree15821f05f1cf0289f4deb8c74525c0c4cdab5c2b /simon
parentc37dd7a192152eee7287055ad541dd351c485331 (diff)
downloadscummvm-rg350-48440c369770552f80a5f1adf14f756819dbaa56.tar.gz
scummvm-rg350-48440c369770552f80a5f1adf14f756819dbaa56.tar.bz2
scummvm-rg350-48440c369770552f80a5f1adf14f756819dbaa56.zip
Prevent quick load/save during copy protection or conversation.
svn-id: r11591
Diffstat (limited to 'simon')
-rw-r--r--simon/simon.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index 4dba0cc6b1..0f04287707 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -4847,9 +4847,8 @@ void SimonEngine::delay(uint amount) {
_saveLoadFlag = (event.kbd.flags == OSystem::KBD_ALT) ? 1 : 2;
// We should only allow a load or save when it was possible in original
- // This stops load/save during cutscenes
- // But can still load/save during converstation
- if (!_lock_counter)
+ // This stops load/save during copy protection, conversations and cut scenes
+ if (!_lock_counter && !_show_preposition)
quick_load_or_save();
} else if (event.kbd.flags == OSystem::KBD_CTRL) {
if (event.kbd.keycode == 'a') {