[Scummvm-cvs-logs] SF.net SVN: scummvm:[41944] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 41944
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41944&view=rev
Author:   lordhoto
Date:     2009-06-29 16:06:31 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
Change LoLEngine::generateBrightnessPalette to take Palette objects as parameters.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/lol.cpp
    scummvm/trunk/engines/kyra/lol.h
    scummvm/trunk/engines/kyra/scene_lol.cpp

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-06-29 16:06:18 UTC (rev 41943)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-06-29 16:06:31 UTC (rev 41944)
@@ -1673,14 +1673,14 @@
 }
 
 void LoLEngine::setPaletteBrightness(Palette &pal, int brightness, int modifier) {
-	generateBrightnessPalette(pal.getData(), _screen->getPalette(1).getData(), brightness, modifier);
+	generateBrightnessPalette(pal, _screen->getPalette(1), brightness, modifier);
 	_screen->fadePalette(_screen->getPalette(1), 5, 0);
 	_screen->_fadeFlag = 0;
 }
 
-void LoLEngine::generateBrightnessPalette(uint8 *src, uint8 *dst, int brightness, int modifier) {
-	memcpy(dst, src, 0x300);
-	_screen->loadSpecialColors(dst);
+void LoLEngine::generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int modifier) {
+	dst.copy(src);
+	_screen->loadSpecialColors(dst.getData());
 
 	brightness = (8 - brightness) << 5;
 	if (modifier >= 0 && modifier < 8 && (_flagsTable[31] & 0x08)) {
@@ -2211,11 +2211,11 @@
 			tpal[i * 3 + 2] = 0x3f;
 	}
 
-	generateBrightnessPalette(tpal.getData(), tpal.getData(), _brightness, _lampEffect);
-	generateBrightnessPalette(swampCol.getData(), swampCol.getData(), _brightness, _lampEffect);
+	generateBrightnessPalette(tpal, tpal, _brightness, _lampEffect);
+	generateBrightnessPalette(swampCol, swampCol, _brightness, _lampEffect);
 	swampCol[0] = swampCol[1] = swampCol[2] = tpal[0] = tpal[1] = tpal[2] = 0;
 
-	generateBrightnessPalette(_screen->getPalette(0).getData(), s.getData(), _brightness, _lampEffect);
+	generateBrightnessPalette(_screen->getPalette(0), s, _brightness, _lampEffect);
 
 	int sX = 112;
 	int sY = 0;
@@ -2304,7 +2304,7 @@
 	enableSysTimer(2);
 
 	if (_currentLevel != 11)
-		generateBrightnessPalette(_screen->getPalette(0).getData(), swampCol.getData(), _brightness, _lampEffect);
+		generateBrightnessPalette(_screen->getPalette(0), swampCol, _brightness, _lampEffect);
 
 	playSpellAnimation(0, 0, 0, 2, 0, 0, 0, tpal.getData(), swampCol.getData(), 40, 0);
 
@@ -3662,7 +3662,7 @@
 	for (int i = 1; i < 768; i++)
 		SWAP(s[i], d[i]);
 
-	generateBrightnessPalette(d, d2, _brightness, _lampEffect);
+	generateBrightnessPalette(_screen->getPalette(0), _screen->getPalette(1), _brightness, _lampEffect);
 	_screen->loadSpecialColors(s);
 	_screen->loadSpecialColors(d2);
 

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-06-29 16:06:18 UTC (rev 41943)
+++ scummvm/trunk/engines/kyra/lol.h	2009-06-29 16:06:31 UTC (rev 41944)
@@ -873,7 +873,7 @@
 	void fadeText();
 	void transformRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
 	void setPaletteBrightness(Palette &pal, int brightness, int modifier);
-	void generateBrightnessPalette(uint8 *src, uint8 *dst, int brightness, int modifier);
+	void generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int modifier);
 	void generateFlashPalette(uint8 *src, uint8 *dst, int colorFlags);
 	void updateSequenceBackgroundAnimations();
 

Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp	2009-06-29 16:06:18 UTC (rev 41943)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp	2009-06-29 16:06:31 UTC (rev 41944)
@@ -438,7 +438,7 @@
 		_screen->getLevelOverlay(7)[i] = i & 0xff;
 
 	_loadSuppFilesFlag = 0;
-	generateBrightnessPalette(_screen->getPalette(0).getData(), _screen->getPalette(1).getData(), _brightness, _lampEffect);
+	generateBrightnessPalette(_screen->getPalette(0), _screen->getPalette(1), _brightness, _lampEffect);
 
 	char tname[13];
 	snprintf(tname, sizeof(tname), "LEVEL%.02d.TLC", _currentLevel);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.