[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.72,1.73 logic.cpp,1.193,1.194
Gregory Montoir
cyx at users.sourceforge.net
Sun Mar 14 05:35:10 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31079/queen
Modified Files:
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.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- command.cpp 14 Mar 2004 00:53:24 -0000 1.72
+++ command.cpp 14 Mar 2004 13:26:01 -0000 1.73
@@ -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.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- logic.cpp 7 Mar 2004 10:46:01 -0000 1.193
+++ logic.cpp 14 Mar 2004 13:26:01 -0000 1.194
@@ -2086,8 +2086,6 @@
}
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