[Scummvm-git-logs] scummvm master -> 0a600c2b6d8601b65982ec845368062cc84e9edc

[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:
0a600c2b6d GLK: COMPREHEND: Fix OPCODE_OBJECT_NOT_IN_ROOM


Commit: 0a600c2b6d8601b65982ec845368062cc84e9edc
    https://github.com/scummvm/scummvm/commit/0a600c2b6d8601b65982ec845368062cc84e9edc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-07-01T18:47:12-07:00

Commit Message:
GLK: COMPREHEND: Fix OPCODE_OBJECT_NOT_IN_ROOM

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


diff --git a/engines/glk/comprehend/game.cpp b/engines/glk/comprehend/game.cpp
index dd7c8754df..2336235d44 100644
--- a/engines/glk/comprehend/game.cpp
+++ b/engines/glk/comprehend/game.cpp
@@ -697,7 +697,7 @@ void ComprehendGame::eval_instruction(FunctionState *func_state,
 
 	case OPCODE_OBJECT_NOT_IN_ROOM:
 		item = get_item(instr->_operand[0] - 1);
-		func_set_test_result(func_state, !item || item->_room != instr->_operand[1]);
+		func_set_test_result(func_state, !item || item->_room != _currentRoom);
 		break;
 
 	case OPCODE_CURRENT_OBJECT_NOT_IN_ROOM: