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

[lordhoto at users.sourceforge.net]

Revision: 43195
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43195&view=rev
Author:   lordhoto
Date:     2009-08-10 01:33:36 +0000 (Mon, 10 Aug 2009)

Log Message:
-----------
Fix interface text color.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp
    scummvm/trunk/engines/kyra/screen.h
    scummvm/trunk/engines/kyra/staticres.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-08-10 01:33:18 UTC (rev 43194)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-08-10 01:33:36 UTC (rev 43195)
@@ -646,16 +646,22 @@
 	updateScreen();
 }
 
-void Screen::setInterfacePalette(const Palette &pal) {
+void Screen::setInterfacePalette(const Palette &pal, uint8 r, uint8 g, uint8 b) {
 	if (_vm->gameFlags().platform != Common::kPlatformAmiga)
 		return;
 
 	uint8 screenPal[256 * 4];
 
 	for (int i = 0; i < pal.getNumColors(); ++i) {
-		screenPal[4 * i + 0] = (pal[i * 3 + 0] * 0xFF) / 0x3F;
-		screenPal[4 * i + 1] = (pal[i * 3 + 1] * 0xFF) / 0x3F;
-		screenPal[4 * i + 2] = (pal[i * 3 + 2] * 0xFF) / 0x3F;
+		if (i != 0x10) {
+			screenPal[4 * i + 0] = (pal[i * 3 + 0] * 0xFF) / 0x3F;
+			screenPal[4 * i + 1] = (pal[i * 3 + 1] * 0xFF) / 0x3F;
+			screenPal[4 * i + 2] = (pal[i * 3 + 2] * 0xFF) / 0x3F;
+		} else {
+			screenPal[4 * i + 0] = (r * 0xFF) / 0x3F;
+			screenPal[4 * i + 1] = (g * 0xFF) / 0x3F;
+			screenPal[4 * i + 2] = (b * 0xFF) / 0x3F;
+		}
 		screenPal[4 * i + 3] = 0;
 	}
 

Modified: scummvm/trunk/engines/kyra/screen.h
===================================================================
--- scummvm/trunk/engines/kyra/screen.h	2009-08-10 01:33:18 UTC (rev 43194)
+++ scummvm/trunk/engines/kyra/screen.h	2009-08-10 01:33:36 UTC (rev 43195)
@@ -357,7 +357,7 @@
 
 	// AMIGA version only
 	void enableInterfacePalette(bool e);
-	void setInterfacePalette(const Palette &pal);
+	void setInterfacePalette(const Palette &pal, uint8 r, uint8 g, uint8 b);
 
 	void getRealPalette(int num, uint8 *dst);
 	Palette &getPalette(int num);

Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp	2009-08-10 01:33:18 UTC (rev 43194)
+++ scummvm/trunk/engines/kyra/staticres.cpp	2009-08-10 01:33:36 UTC (rev 43195)
@@ -1602,7 +1602,7 @@
 
 	if (_flags.platform == Common::kPlatformAmiga) {
 		_screen->copyPalette(1, 0);
-		_screen->setInterfacePalette(_screen->getPalette(1));
+		_screen->setInterfacePalette(_screen->getPalette(1), 0x3F, 0x3F, 0x3F);
 
 		// TODO: Move this to a better place
 		_screen->enableInterfacePalette(true);


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