[Scummvm-git-logs] scummvm master -> 2d207075510976b6a5c038af0b64faf95ccbcc1c

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2d20707551 GLK: COMPREHEND: CC: Fix 'leave house' action


Commit: 2d207075510976b6a5c038af0b64faf95ccbcc1c
    https://github.com/scummvm/scummvm/commit/2d207075510976b6a5c038af0b64faf95ccbcc1c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-06-18T12:54:56-07:00

Commit Message:
GLK: COMPREHEND: CC: Fix 'leave house' action

Changed paths:
    engines/glk/comprehend/game.cpp


diff --git a/engines/glk/comprehend/game.cpp b/engines/glk/comprehend/game.cpp
index e8860c8361..13cc21fcc2 100644
--- a/engines/glk/comprehend/game.cpp
+++ b/engines/glk/comprehend/game.cpp
@@ -772,9 +772,8 @@ void ComprehendGame::eval_instruction(FunctionState *func_state,
 		break;
 
 	case OPCODE_OBJECT_NOT_VALID:
-		/* FIXME - should be called OPCODE_CURRENT_OBJECT_NOT_VALID */
-		func_set_test_result(func_state, !noun ||
-		                     (noun->_type & WORD_TYPE_NOUN_MASK) == 0);
+		func_set_test_result(func_state, !noun || !get_item_by_noun(noun)
+			|| (noun->_type & WORD_TYPE_NOUN_MASK) == 0);
 		break;
 
 	case OPCODE_CURRENT_IS_OBJECT: