aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFlorian Kagerer2009-05-31 17:58:19 +0000
committerFlorian Kagerer2009-05-31 17:58:19 +0000
commitdad6073548ee02cd81dbfbc8457f6d8c0252d227 (patch)
treeb679d38e6b2e0df4c12ea447a1ef33a5d2c3b01b /engines
parente072532458b177c281302957c6eda318914e52c2 (diff)
downloadscummvm-rg350-dad6073548ee02cd81dbfbc8457f6d8c0252d227.tar.gz
scummvm-rg350-dad6073548ee02cd81dbfbc8457f6d8c0252d227.tar.bz2
scummvm-rg350-dad6073548ee02cd81dbfbc8457f6d8c0252d227.zip
LOL: prevent saving/loading in inventory screen
svn-id: r41080
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/gui_lol.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/gui_lol.cpp b/engines/kyra/gui_lol.cpp
index 6681ab8e87..f2b6c74d49 100644
--- a/engines/kyra/gui_lol.cpp
+++ b/engines/kyra/gui_lol.cpp
@@ -704,7 +704,7 @@ void LoLEngine::gui_toggleFightButtons(bool disable) {
void LoLEngine::gui_updateInput() {
// TODO: We need to catch all cases where loading is not possible and
// set the "mainLoop" parameter to false for them.
- int inputFlag = checkInput(_activeButtons, !(_updateFlags & 3), 0);
+ int inputFlag = checkInput(_activeButtons, !((_updateFlags & 3) || _weaponsDisabled), 0);
if (_preserveEvents)
_preserveEvents = false;