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

[lordhoto at users.sourceforge.net]

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

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

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

Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp	2009-06-29 16:08:16 UTC (rev 41947)
+++ scummvm/trunk/engines/kyra/lol.cpp	2009-06-29 16:08:28 UTC (rev 41948)
@@ -1695,26 +1695,21 @@
 	}
 }
 
-void LoLEngine::generateFlashPalette(uint8 *src, uint8 *dst, int colorFlags) {
-	if (!src || !dst)
-		return;
+void LoLEngine::generateFlashPalette(const Palette &src, Palette &dst, int colorFlags) {
+	dst.copy(src, 0, 2);
 
-	memcpy(dst, src, 6);
-
-	uint8 *s = src + 6;
-	uint8 *d = dst + 6;
-
 	for (int i = 2; i < 128; i++) {
 		for (int ii = 0; ii < 3; ii++) {
-			uint8 t = *s++ & 0x3f;
+			uint8 t = src[i * 3 + ii] & 0x3f;
 			if (colorFlags & (1 << ii))
 				t += ((0x3f - t) >> 1);
 			else
 				t -= (t >> 1);
-			*d++ = t;
+			dst[i * 3 + ii] = t;
 		}
 	}
-	memcpy(d, s, 384);
+
+	dst.copy(src, 128);
 }
 
 void LoLEngine::updateSequenceBackgroundAnimations() {

Modified: scummvm/trunk/engines/kyra/lol.h
===================================================================
--- scummvm/trunk/engines/kyra/lol.h	2009-06-29 16:08:16 UTC (rev 41947)
+++ scummvm/trunk/engines/kyra/lol.h	2009-06-29 16:08:28 UTC (rev 41948)
@@ -874,7 +874,7 @@
 	void transformRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage);
 	void setPaletteBrightness(const Palette &srcPal, int brightness, int modifier);
 	void generateBrightnessPalette(const Palette &src, Palette &dst, int brightness, int modifier);
-	void generateFlashPalette(uint8 *src, uint8 *dst, int colorFlags);
+	void generateFlashPalette(const Palette &src, Palette &dst, int colorFlags);
 	void updateSequenceBackgroundAnimations();
 
 	bool _dialogueField;

Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp	2009-06-29 16:08:16 UTC (rev 41947)
+++ scummvm/trunk/engines/kyra/script_lol.cpp	2009-06-29 16:08:28 UTC (rev 41948)
@@ -2105,7 +2105,7 @@
 	Palette &p2 = _screen->getPalette(3);
 
 	uint8 ovl[256];
-	generateFlashPalette(p1.getData(), p2.getData(), stackPos(0));
+	generateFlashPalette(p1, p2, stackPos(0));
 	_screen->loadSpecialColors(p1);
 	_screen->loadSpecialColors(p2);
 


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