[Scummvm-git-logs] scummvm master -> a3526a9e2bc24bcfb73664072a6a7cd836bd49b0

[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:
a3526a9e2b GLK: COMPREHEND: Fix testing object validity


Commit: a3526a9e2bc24bcfb73664072a6a7cd836bd49b0
    https://github.com/scummvm/scummvm/commit/a3526a9e2bc24bcfb73664072a6a7cd836bd49b0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-04T11:10:09-07:00

Commit Message:
GLK: COMPREHEND: Fix testing object validity

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


diff --git a/engines/glk/comprehend/game.cpp b/engines/glk/comprehend/game.cpp
index 5d391b290a..c7c596ef27 100644
--- a/engines/glk/comprehend/game.cpp
+++ b/engines/glk/comprehend/game.cpp
@@ -829,8 +829,7 @@ void ComprehendGame::eval_instruction(FunctionState *func_state,
 		break;
 
 	case OPCODE_OBJECT_NOT_VALID:
-		func_set_test_result(func_state, !noun || !get_item_by_noun(noun)
-			|| (noun->_type & WORD_TYPE_NOUN_MASK) == 0);
+		func_set_test_result(func_state, !noun);
 		break;
 
 	case OPCODE_CURRENT_IS_OBJECT: