aboutsummaryrefslogtreecommitdiff
path: root/queen
diff options
context:
space:
mode:
authorGregory Montoir2004-03-14 13:26:01 +0000
committerGregory Montoir2004-03-14 13:26:01 +0000
commite8dde78b9dff3e44293b2c59c9335125105ed9d0 (patch)
tree6be8f21e4fb4a329221c2a40b2a1843f065791f6 /queen
parent309a0a80f26976b1a48f119d8d6fe5ee4dfac80e (diff)
downloadscummvm-rg350-e8dde78b9dff3e44293b2c59c9335125105ed9d0.tar.gz
scummvm-rg350-e8dde78b9dff3e44293b2c59c9335125105ed9d0.tar.bz2
scummvm-rg350-e8dde78b9dff3e44293b2c59c9335125105ed9d0.zip
prevent journal from reappearing when F1 is pressed more than once
svn-id: r13272
Diffstat (limited to 'queen')
-rw-r--r--queen/command.cpp3
-rw-r--r--queen/logic.cpp2
2 files changed, 1 insertions, 4 deletions
diff --git a/queen/command.cpp b/queen/command.cpp
index 27b9e2773e..084cc83026 100644
--- a/queen/command.cpp
+++ b/queen/command.cpp
@@ -235,7 +235,6 @@ void Command::updatePlayer() {
}
if (_vm->input()->keyVerb() != VERB_NONE) {
-
if (_vm->input()->keyVerb() == VERB_USE_JOURNAL) {
_vm->logic()->useJournal();
} else if (_vm->input()->keyVerb() != VERB_SKIP_TEXT) {
@@ -252,8 +251,8 @@ void Command::updatePlayer() {
} else {
grabSelectedVerb();
}
- _vm->input()->clearKeyVerb();
}
+ _vm->input()->clearKeyVerb();
}
_mouseKey = _vm->input()->mouseButton();
diff --git a/queen/logic.cpp b/queen/logic.cpp
index 3afd30be76..be5d6a3ec0 100644
--- a/queen/logic.cpp
+++ b/queen/logic.cpp
@@ -2086,8 +2086,6 @@ bool LogicInterview::handleSpecialMove(uint16 sm) {
}
void LogicGame::useJournal() {
- _vm->input()->clearMouseButton();
- _vm->input()->clearKeyVerb();
_vm->command()->clear(false);
_journal->use();
_vm->walk()->stopJoe();