aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v6.cpp
diff options
context:
space:
mode:
authorTravis Howell2005-04-17 12:55:42 +0000
committerTravis Howell2005-04-17 12:55:42 +0000
commitcaae2f00de411c7a26f5d5cd0a31fe23a017e501 (patch)
tree442af92f4dd377ef15926b718066ff1693fe75cb /scumm/script_v6.cpp
parent2141a2648cba0451aec05c8ef2a8ad5dd724ef16 (diff)
downloadscummvm-rg350-caae2f00de411c7a26f5d5cd0a31fe23a017e501.tar.gz
scummvm-rg350-caae2f00de411c7a26f5d5cd0a31fe23a017e501.tar.bz2
scummvm-rg350-caae2f00de411c7a26f5d5cd0a31fe23a017e501.zip
Add separate function for loading palette from choosen room.
Avoid pointer problems. svn-id: r17653
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r--scumm/script_v6.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 680192a4be..7e8b89862e 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -1757,7 +1757,7 @@ void ScummEngine_v6::o6_roomOps() {
if (_gameId == GID_SAMNMAX && vm.slot[_currentScript].number == 64)
setDirtyColors(0, 255);
else
- setPalette(a, _roomResource);
+ setPalette(a);
break;
default:
error("o6_roomOps: default case %d", op);