From 882662977f2cdf574e5aab041ceaaf626386d0f2 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 22 Jun 2009 02:35:45 +0000
Subject: Changed Screen::getPalette to return a reference to a Palette object.

svn-id: r41741
---
 engines/kyra/screen_lok.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'engines/kyra/screen_lok.cpp')

diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp
index 7796b5d27c..a7cad28aa8 100644
--- a/engines/kyra/screen_lok.cpp
+++ b/engines/kyra/screen_lok.cpp
@@ -80,13 +80,15 @@ const ScreenDim *Screen_LoK::getScreenDim(int dim) {
 
 void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime) {
 	assert(_vm->palTable1()[palIndex]);
-	assert(getPalette(0));
+
 	uint8 tempPal[768];
-	memcpy(tempPal, getPalette(0), 768);
+	memcpy(tempPal, getPalette(0).getData(), 768);
 	memcpy(&tempPal[startIndex*3], _vm->palTable1()[palIndex], size*3);
+
 	fadePalette(tempPal, fadeTime*18);
-	memcpy(&getPalette(0)[startIndex*3], &tempPal[startIndex*3], size*3);
-	setScreenPalette(getPalette(0));
+
+	getPalette(0).copy(tempPal, startIndex, size);
+	setScreenPalette(getPalette(0).getData());
 	_system->updateScreen();
 }
 
-- 
cgit v1.2.3