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_lol.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp
index 8ff1437a46..8e06c112ff 100644
--- a/engines/kyra/screen_lol.cpp
+++ b/engines/kyra/screen_lol.cpp
@@ -284,7 +284,7 @@ void Screen_LoL::fadeClearSceneWindow(int delay) {
 
 	uint8 *tpal = new uint8[768];
 
-	memcpy(tpal, getPalette(0), 768);
+	memcpy(tpal, getPalette(0).getData(), 768);
 	memset(tpal, 0, 384);
 	loadSpecialColors(tpal);
 	fadePalette(tpal, delay);
@@ -838,8 +838,8 @@ void Screen_LoL::fadeToBlack(int delay, const UpdateFunctor *upFunc) {
 }
 
 void Screen_LoL::fadeToPalette1(int delay) {
-	loadSpecialColors(getPalette(1));
-	fadePalette(getPalette(1), delay);
+	loadSpecialColors(getPalette(1).getData());
+	fadePalette(getPalette(1).getData(), delay);
 	_fadeFlag = 0;
 }
 
@@ -864,7 +864,7 @@ void Screen_LoL::copyColor(int dstColorIndex, int srcColorIndex) {
 bool Screen_LoL::fadeColor(int dstColorIndex, int srcColorIndex, uint32 elapsedTime, uint32 targetTime) {
 	uint8 *dst = _screenPalette->getData() + 3 * dstColorIndex;
 	uint8 *src = _screenPalette->getData() + 3 * srcColorIndex;
-	uint8 *p = getPalette(1) + 3 * dstColorIndex;
+	uint8 *p = getPalette(1).getData() + 3 * dstColorIndex;
 
 	bool res = false;
 
@@ -908,7 +908,7 @@ bool Screen_LoL::fadeColor(int dstColorIndex, int srcColorIndex, uint32 elapsedT
 
 bool Screen_LoL::fadePaletteStep(uint8 *pal1, uint8 *pal2, uint32 elapsedTime, uint32 targetTime) {
 	uint8 tpal[768];
-	uint8 *p1 = getPalette(1);
+	uint8 *p1 = getPalette(1).getData();
 
 	bool res = false;
 	for (int i = 0; i < 768; i++) {
-- 
cgit v1.2.3