diff options
| author | Gregory Montoir | 2004-01-21 22:04:39 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2004-01-21 22:04:39 +0000 |
| commit | 2d7f1b9d0f12176730c1074d0b6c4756ba27a321 (patch) | |
| tree | 2d1208c4358b627503278efc0d9f509d335d784a | |
| parent | 5bc6d14e339eca6829a2c48b9dde3aa5b0e67498 (diff) | |
| download | scummvm-rg350-2d7f1b9d0f12176730c1074d0b6c4756ba27a321.tar.gz scummvm-rg350-2d7f1b9d0f12176730c1074d0b6c4756ba27a321.tar.bz2 scummvm-rg350-2d7f1b9d0f12176730c1074d0b6c4756ba27a321.zip | |
clear user input before entering Journal (no more load problems occuring when journal is started as joe is about to do sthg)
svn-id: r12568
| -rw-r--r-- | queen/command.cpp | 1 | ||||
| -rw-r--r-- | queen/logic.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/queen/command.cpp b/queen/command.cpp index cc038ca060..1d7e7eafcb 100644 --- a/queen/command.cpp +++ b/queen/command.cpp @@ -214,7 +214,6 @@ void Command::updatePlayer() { if (_vm->input()->keyVerb() == VERB_USE_JOURNAL) { _vm->logic()->useJournal(); - _vm->input()->clearKeyVerb(); } else if (_vm->input()->keyVerb() != VERB_SKIP_TEXT) { _state.verb = _vm->input()->keyVerb(); if (isVerbInv(_state.verb)) { diff --git a/queen/logic.cpp b/queen/logic.cpp index febabf59e5..4ab3aaa865 100644 --- a/queen/logic.cpp +++ b/queen/logic.cpp @@ -2105,6 +2105,8 @@ bool LogicInterview::handleSpecialMove(uint16 sm) { } void LogicGame::useJournal() { + _vm->input()->clearMouseButton(); + _vm->input()->clearKeyVerb(); _vm->command()->clear(false); _journal->use(); _vm->walk()->stopJoe(); |