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

[sev-]

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:
ae8f6397eb SCUMM: Prevent darkenPallete() in Room 0 in FT, fixes bug #9871


Commit: ae8f6397ebde77c5469735227d5d303a9d3f170d
    https://github.com/scummvm/scummvm/commit/ae8f6397ebde77c5469735227d5d303a9d3f170d
Author: Ben Castricum (github at bencastricum.nl)
Date: 2017-08-17T09:47:03+01:00

Commit Message:
SCUMM: Prevent darkenPallete() in Room 0 in FT, fixes bug #9871

Changed paths:
    engines/scumm/script_v6.cpp


diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 62c62c0..5cbbd93 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -1636,6 +1636,9 @@ void ScummEngine_v6::o6_roomOps() {
 		c = pop();
 		b = pop();
 		a = pop();
+		// Prevent assert() error with corner case, fixes bug #9871
+		if (_game.id == GID_FT && _roomResource == 0)
+			break;
 		darkenPalette(a, a, a, b, c);
 		break;