From 9da52cb28280e0164db7073b0d3ea5abb4d20934 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 22 Jun 2009 02:35:04 +0000
Subject: Got rid of Screen::_currentPalette.

svn-id: r41740
---
 engines/kyra/seqplayer.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index 713a2251b0..214acb6240 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -92,7 +92,7 @@ uint8 *SeqPlayer::setPanPages(int pageNum, int shape) {
 }
 
 void SeqPlayer::makeHandShapes() {
-	_screen->loadBitmap("WRITING.CPS", 3, 3, _screen->_currentPalette);
+	_screen->loadBitmap("WRITING.CPS", 3, 3, _screen->getPalette(0));
 	if (_vm->gameFlags().platform == Common::kPlatformMacintosh || _vm->gameFlags().platform == Common::kPlatformAmiga) {
 		freeHandShapes();
 
@@ -241,25 +241,25 @@ void SeqPlayer::s1_loadPalette() {
 
 	if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
 		if (!colNum)
-			memcpy(_screen->_currentPalette, _screen->_currentPalette + 576, 3*32);
+			memcpy(_screen->getPalette(0), _screen->getPalette(0) + 576, 3*32);
 		else if (colNum == 3)
-			memcpy(_screen->_currentPalette, _screen->_currentPalette + 672, 3*32);
+			memcpy(_screen->getPalette(0), _screen->getPalette(0) + 672, 3*32);
 		else if (colNum == 4)
-			memcpy(_screen->_currentPalette, _screen->_currentPalette + 288, 3*32);
+			memcpy(_screen->getPalette(0), _screen->getPalette(0) + 288, 3*32);
 
-		_screen->setScreenPalette(_screen->_currentPalette);
+		_screen->setScreenPalette(_screen->getPalette(0));
 	} else {
 		uint32 fileSize;
 		uint8 *srcData;
 		srcData = _res->fileData(_vm->seqCOLTable()[colNum], &fileSize);
-		memcpy(_screen->_currentPalette, srcData, fileSize);
+		memcpy(_screen->getPalette(0), srcData, fileSize);
 		delete[] srcData;
 	}
 }
 
 void SeqPlayer::s1_loadBitmap() {
 	uint8 cpsNum = *_seqData++;
-	_screen->loadBitmap(_vm->seqCPSTable()[cpsNum], 3, 3, _screen->_currentPalette);
+	_screen->loadBitmap(_vm->seqCPSTable()[cpsNum], 3, 3, _screen->getPalette(0));
 }
 
 void SeqPlayer::s1_fadeToBlack() {
-- 
cgit v1.2.3