[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.59,1.60 command.h,1.16,1.17 grid.cpp,1.3,1.4

[Gregory Montoir]

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

Modified Files:
	command.cpp command.h grid.cpp 
Log Message:
cleanup

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- command.cpp	13 Jan 2004 14:43:13 -0000	1.59
+++ command.cpp	14 Jan 2004 10:40:25 -0000	1.60
@@ -212,8 +212,8 @@
 	if (_vm->input()->keyVerb() != VERB_NONE) {
 
 		if (_vm->input()->keyVerb() == VERB_USE_JOURNAL) {
-			_vm->input()->clearKeyVerb();
 			_vm->logic()->useJournal();
+			_vm->input()->clearKeyVerb();
 		} else if (_vm->input()->keyVerb() != VERB_SKIP_TEXT) {
 			_state.verb = _vm->input()->keyVerb();
 			if (isVerbInv(_state.verb)) {
@@ -417,18 +417,6 @@
 	if (_state.subject[0] > 0)
 		changeObjectState(_state.selAction, _state.subject[0], com->song, cutDone);
 
-	// execute.c l.533-548
-	// FIXME: useless test, as .dog has already been played
-	// if (_state.selAction == VERB_TALK_TO && cond > 0) {
-	//	if (executeIfDialog(_vm->logic()->objectTextualDescription(cond))) {
-	//		cleanupCurrentAction();
-	//		return;
-	//	}
-	// }
-
-	// execute.c l.550-589
-	// FIXME: the EXECUTE_EXIT1 stuff can be omitted as it is 
-	//        more or less redundant code
 	if (condResult > 0) {
 		_vm->logic()->makeJoeSpeak(condResult, true);
 	}
@@ -500,7 +488,7 @@
 		grabSelectedVerb();
 	} else if (isVerbInv(_state.verb)) {
 		grabSelectedItem();
-	} else if (_state.noun != 0) { // 0 && _state.noun <= _vm->logic()->currentRoomObjMax()) {
+	} else if (_state.noun != 0) {
 		grabSelectedNoun();
 	} else if (_selPosY < ROOM_ZONE_HEIGHT && _state.verb == VERB_NONE) {
 		// select without a command, do a WALK
@@ -525,7 +513,6 @@
 			_cmdText.display(INK_CMD_NORMAL);
 			_parse = false;
 		} else {
-//			_cmdText.display(INK_CMD_SELECT);
 			_parse = true;
 		}
 	} else if (_state.action == VERB_GIVE && _state.commandLevel == 1) {
@@ -535,7 +522,6 @@
 		_cmdText.display(INK_CMD_NORMAL);
 		_parse = false;
 	} else {
-//		_cmdText.display(INK_CMD_SELECT);
 		_parse = true;
 	}
 
@@ -549,8 +535,6 @@
 }
 
 void Command::grabSelectedItem() {
-//	_parse = true;
-
 	ItemData *id = findItemData(_state.verb);
 	if (id == NULL || id->name <= 0) {
 		return;

Index: command.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- command.h	6 Jan 2004 12:45:29 -0000	1.16
+++ command.h	14 Jan 2004 10:40:25 -0000	1.17
@@ -50,7 +50,6 @@
 	QueenEngine *_vm;
 };
 
-
 struct CmdState {
 
 	void init();
@@ -66,7 +65,6 @@
 	int16 selNoun;
 };
 
-
 class Command {
 public:
 	
@@ -84,12 +82,10 @@
 	//! read all command arrays from stream
 	void readCommandsFrom(byte *&ptr);
 
-
 	enum {
 		MAX_MATCHING_CMDS = 50
 	};
 
-
 private:
 
 	ObjectData *findObjectData(uint16 objRoomNum) const;

Index: grid.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/grid.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- grid.cpp	12 Jan 2004 13:40:01 -0000	1.3
+++ grid.cpp	14 Jan 2004 10:40:25 -0000	1.4
@@ -158,7 +158,7 @@
 		const ZoneSlot *pzs = &_zones[GS_ROOM][i];
 		if (pzs->valid) {
 			const Box *b = &pzs->box;
-			_vm->display()->drawBox(b->x1, b->y1, b->x2, b->y2, 3);	
+			_vm->display()->drawBox(b->x1, b->y1, b->x2, b->y2, 3);
 		}
 	}
 }