[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.68.2.4,1.68.2.5 logic.cpp,1.187.2.4,1.187.2.5

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30651/queen

Modified Files:
      Tag: branch-0-6-0
	command.cpp logic.cpp 
Log Message:
prevent journal from reappearing when F1 is pressed more than once

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.68.2.4
retrieving revision 1.68.2.5
diff -u -d -r1.68.2.4 -r1.68.2.5
--- command.cpp	14 Mar 2004 00:52:53 -0000	1.68.2.4
+++ command.cpp	14 Mar 2004 13:23:55 -0000	1.68.2.5
@@ -235,7 +235,6 @@
 	}
 
 	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 @@
 			} else {
 				grabSelectedVerb();
 			}
-			_vm->input()->clearKeyVerb();
 		}
+		_vm->input()->clearKeyVerb();
 	}
 
 	_mouseKey = _vm->input()->mouseButton();

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.187.2.4
retrieving revision 1.187.2.5
diff -u -d -r1.187.2.4 -r1.187.2.5
--- logic.cpp	7 Mar 2004 10:44:43 -0000	1.187.2.4
+++ logic.cpp	14 Mar 2004 13:23:55 -0000	1.187.2.5
@@ -2086,8 +2086,6 @@
 }
 
 void LogicGame::useJournal() {
-	_vm->input()->clearMouseButton();
-	_vm->input()->clearKeyVerb();
 	_vm->command()->clear(false);
 	_journal->use();
 	_vm->walk()->stopJoe();