[Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.82,1.83

[Gregory Montoir]

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

Modified Files:
	command.cpp 
Log Message:
possible 'fix' for bug #1233495 (FOTAQ code is so hackish...)

Index: command.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/command.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- command.cpp	24 Jun 2005 15:22:44 -0000	1.82
+++ command.cpp	6 Jul 2005 22:35:18 -0000	1.83
@@ -226,16 +226,20 @@
 		}
 	}
 
-	if (cond <= 0 && _state.selAction == VERB_LOOK_AT) {
-		lookAtSelectedObject();
+	if (_state.selAction == VERB_USE_JOURNAL) {
+		clear(true);
 	} else {
-		// only play song if it's a PLAY AFTER type
-		if (com->song < 0) {
-			_vm->sound()->playSong(-com->song);
+		if (cond <= 0 && _state.selAction == VERB_LOOK_AT) {
+			lookAtSelectedObject();
+		} else {
+			// only play song if it's a PLAY AFTER type
+			if (com->song < 0) {
+				_vm->sound()->playSong(-com->song);
+			}
+			clear(true);
 		}
-		clear(true);
+		cleanupCurrentAction();
 	}
-	cleanupCurrentAction();
 }
 
 void Command::updatePlayer() {	
@@ -433,6 +437,7 @@
 	switch (com->specialSection) {
 	case 1:
 		_vm->logic()->useJournal();
+		_state.selAction = VERB_USE_JOURNAL;
 		return condResult;
 	case 2:
 		_vm->logic()->joeUseDress(true);