[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.65,1.66 logic.cpp,1.180,1.181

Gregory Montoir cyx at users.sourceforge.net
Wed Jan 21 14:05:05 CET 2004


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv28844/queen

Modified Files:
	command.cpp logic.cpp 
Log Message:
clear user input before entering Journal (no more load problems occuring when journal is started as joe is about to do sthg)

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- command.cpp	16 Jan 2004 20:48:08 -0000	1.65
+++ command.cpp	21 Jan 2004 22:04:39 -0000	1.66
@@ -214,7 +214,6 @@
 
 		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)) {

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- logic.cpp	20 Jan 2004 21:58:26 -0000	1.180
+++ logic.cpp	21 Jan 2004 22:04:39 -0000	1.181
@@ -2105,6 +2105,8 @@
 }
 
 void LogicGame::useJournal() {
+	_vm->input()->clearMouseButton();
+	_vm->input()->clearKeyVerb();
 	_vm->command()->clear(false);
 	_journal->use();
 	_vm->walk()->stopJoe();





More information about the Scummvm-git-logs mailing list