[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.43,1.44

[Gregory Montoir]

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

Modified Files:
	command.cpp 
Log Message:
re-enable keyboard commands

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- command.cpp	14 Dec 2003 20:24:29 -0000	1.43
+++ command.cpp	14 Dec 2003 21:39:52 -0000	1.44
@@ -249,23 +249,23 @@
 			_vm->input()->clearKeyVerb();
 			_vm->logic()->useJournal();
 		}
-//		else if (_vm->input()->keyVerb() != VERB_SKIP_TEXT) {
-//			_state.verb = _vm->input()->keyVerb();
-//			if (isVerbInv(_state.verb)) {
-//				_state.noun = _state.selNoun = 0;
-//				// Clear old noun and old verb in case we're pointing at an
-//				// object (noun) or item (verb) and we want to use an item
-//				// on it. This was the command will be redisplayed with the
-//				// object/item that the cursor is currently on.
-//				_state.oldNoun = 0;
-//				_state.oldVerb = VERB_NONE;
-//				grabSelectedItem();
-//			}
-//			else {
-//				grabSelectedVerb();
-//			}
-//			_vm->input()->clearKeyVerb();
-//		}
+		else if (_vm->input()->keyVerb() != VERB_SKIP_TEXT) {
+			_state.verb = _vm->input()->keyVerb();
+			if (isVerbInv(_state.verb)) {
+				_state.noun = _state.selNoun = 0;
+				// Clear old noun and old verb in case we're pointing at an
+				// object (noun) or item (verb) and we want to use an item
+				// on it. This was the command will be redisplayed with the
+				// object/item that the cursor is currently on.
+				_state.oldNoun = 0;
+				_state.oldVerb = VERB_NONE;
+				grabSelectedItem();
+			}
+			else {
+				grabSelectedVerb();
+			}
+			_vm->input()->clearKeyVerb();
+		}
 	}
 
 	_mouseKey = _vm->input()->mouseButton();
@@ -612,26 +612,26 @@
 	// If we've selected via keyboard, and there is no VERB then do
 	// the ITEMs default, otherwise keep constructing!
 
-	if (_mouseKey == Input::MOUSE_LBUTTON) {
-//		|| (_vm->input()->keyVerb() != VERB_NONE && _state.verb != VERB_NONE)) {
+	if (_mouseKey == Input::MOUSE_LBUTTON ||
+		(_vm->input()->keyVerb() != VERB_NONE && _state.verb != VERB_NONE)) {
 		if (_state.action == VERB_NONE) {
-//			if (_vm->input()->keyVerb() != VERB_NONE) {
-//				// We've selected via the keyboard, no command is being 
-//				// constructed, so we shall find the item's default
-//				_state.verb = findDefault(item, true);
-//				if (_state.verb == VERB_NONE) {
-//					// set to Look At
-//					_state.verb = VERB_LOOK_AT;
-//					_cmdText.setVerb(VERB_LOOK_AT);
-//				}
-//				_state.action = _state.verb;
-//			}
-//			else {
+			if (_vm->input()->keyVerb() != VERB_NONE) {
+				// We've selected via the keyboard, no command is being 
+				// constructed, so we shall find the item's default
+				_state.verb = State::findDefaultVerb(id->state);
+				if (_state.verb == VERB_NONE) {
+					// set to Look At
+					_state.verb = VERB_LOOK_AT;
+					_cmdText.setVerb(VERB_LOOK_AT);
+				}
+				_state.action = _state.verb;
+			}
+			else {
 				// Action>0 ONLY if command has been constructed 
 				// Left Mouse Button pressed just do Look At     
 				_state.action = VERB_LOOK_AT;
 				_cmdText.setVerb(VERB_LOOK_AT);
-//			}
+			}
 		}
 		_state.verb = VERB_NONE;
 	}