[Scummvm-git-logs] scummvm master -> 6c8555749cd8600ec7e00f3c8bad4f71a78d5ebd

[elasota]

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:
6c8555749c MTROPOLIS: Fix incorrect dereference result handling


Commit: 6c8555749cd8600ec7e00f3c8bad4f71a78d5ebd
    https://github.com/scummvm/scummvm/commit/6c8555749cd8600ec7e00f3c8bad4f71a78d5ebd
Author: elasota (ejlasota at gmail.com)
Date: 2022-07-04T17:23:50-04:00

Commit Message:
MTROPOLIS: Fix incorrect dereference result handling

Changed paths:
    engines/mtropolis/miniscript.cpp


diff --git a/engines/mtropolis/miniscript.cpp b/engines/mtropolis/miniscript.cpp
index eae039bd0cf..57ef7cb3cbf 100644
--- a/engines/mtropolis/miniscript.cpp
+++ b/engines/mtropolis/miniscript.cpp
@@ -1931,8 +1931,9 @@ bool MiniscriptThread::evaluateTruthOfResult(bool &isTrue) {
 		return false;
 	}
 
-	if (!dereferenceRValue(0, false)) {
-		this->error("Failed to dereference Miniscript RValue for truth evaluation");
+	MiniscriptInstructionOutcome outcome = dereferenceRValue(0, false);
+	if (outcome != kMiniscriptInstructionOutcomeContinue) {
+		this->error("Miniscript program result couldn't be dereferenced");
 		return false;
 	}