From caae2f00de411c7a26f5d5cd0a31fe23a017e501 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 17 Apr 2005 12:55:42 +0000
Subject: Add separate function for loading palette from choosen room. Avoid
 pointer problems.

svn-id: r17653
---
 scumm/script_v6.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scumm/script_v6.cpp')

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);
-- 
cgit v1.2.3