aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorBen Castricum2017-08-15 21:30:44 +0200
committerEugene Sandulenko2017-08-17 09:47:03 +0100
commitae8f6397ebde77c5469735227d5d303a9d3f170d (patch)
treea428ac966ea361504e868418d5901111d19a6c8d /engines/scumm/script_v6.cpp
parentc33637769e2d33ad6c4e372e633334ad2d85aa95 (diff)
downloadscummvm-rg350-ae8f6397ebde77c5469735227d5d303a9d3f170d.tar.gz
scummvm-rg350-ae8f6397ebde77c5469735227d5d303a9d3f170d.tar.bz2
scummvm-rg350-ae8f6397ebde77c5469735227d5d303a9d3f170d.zip
SCUMM: Prevent darkenPallete() in Room 0 in FT, fixes bug #9871
Diffstat (limited to 'engines/scumm/script_v6.cpp')
-rw-r--r--engines/scumm/script_v6.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 62c62c0b4a..5cbbd93265 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;