possible 'fix' for bug #1233495 (FOTAQ code is so hackish...)

svn-id: r18506

1 files changed, 12 insertions, 7 deletions

diff --git a/queen/command.cpp b/queen/command.cpp
index 80eca7f0a4..afc1be4ecc 100644
--- a/queen/command.cpp
+++ b/queen/command.cpp
@@ -226,16 +226,20 @@ void Command::executeCurrentAction() {
 		}
 	}
 
-	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 @@ int16 Command::executeCommand(uint16 comId, int16 condResult) {
 	switch (com->specialSection) {
 	case 1:
 		_vm->logic()->useJournal();
+		_state.selAction = VERB_USE_JOURNAL;
 		return condResult;
 	case 2:
 		_vm->logic()->joeUseDress(true);