[Scummvm-cvs-logs] SF.net SVN: scummvm: [25786] scummvm/trunk/engines/queen

[cyx at users.sourceforge.net]

Revision: 25786
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25786&view=rev
Author:   cyx
Date:     2007-02-22 04:20:56 -0800 (Thu, 22 Feb 2007)

Log Message:
-----------
setup default colors for Amiga versions

Modified Paths:
--------------
    scummvm/trunk/engines/queen/display.cpp
    scummvm/trunk/engines/queen/display.h

Modified: scummvm/trunk/engines/queen/display.cpp
===================================================================
--- scummvm/trunk/engines/queen/display.cpp	2007-02-22 12:12:45 UTC (rev 25785)
+++ scummvm/trunk/engines/queen/display.cpp	2007-02-22 12:20:56 UTC (rev 25786)
@@ -534,6 +534,13 @@
 	_pal.scrollable = true;
 }
 
+void Display::palSetPanelColor(uint8 color, uint8 r, uint8 g, uint8 b) {
+	color -= 144;
+	_pal.panel[color * 3] = r;
+	_pal.panel[color * 3 + 1] = g;
+	_pal.panel[color * 3 + 2] = b;
+}
+
 int Display::getNumColorsForRoom(uint16 room) const {
 	int n = 224;
 	if (room >= 114 && room <= 125) {
@@ -635,6 +642,14 @@
 
 	if (_vm->resource()->getPlatform() == Common::kPlatformAmiga) {
 		decodeLBM(data, dataSize, _panelBuf, PANEL_W, &panelWidth, &panelHeight, _pal.panel, 0, 32, 144);
+		// setup special colors
+		// XXX set correct color values
+		palSetPanelColor(INK_BG_PANEL, 255, 255, 255);
+		palSetPanelColor(INK_JOURNAL, 255, 255, 255);
+		palSetPanelColor(INK_PINNACLE_ROOM, 255, 255, 255);
+		palSetPanelColor(INK_CMD_SELECT, 255, 255, 255);
+		palSetPanelColor(INK_CMD_NORMAL, 255, 255, 255);
+		palSetPanelColor(INK_CMD_LOCK, 255, 255, 255);
 	} else {
 		WRITE_LE_UINT16(data + 14, PANEL_H - 10);
 		decodePCX(data, dataSize, _panelBuf + PANEL_W * 10, PANEL_W, &panelWidth, &panelHeight, _pal.panel, 144, 256);

Modified: scummvm/trunk/engines/queen/display.h
===================================================================
--- scummvm/trunk/engines/queen/display.h	2007-02-22 12:12:45 UTC (rev 25785)
+++ scummvm/trunk/engines/queen/display.h	2007-02-22 12:20:56 UTC (rev 25786)
@@ -84,6 +84,8 @@
 	void palCustomLightsOff(uint16 roomNum);
 	void palCustomLightsOn(uint16 roomNum);
 
+	void palSetPanelColor(uint8 color, uint8 r, uint8 g, uint8 b);
+
 	//! mark all palette entries as dirty
 	void palSetAllDirty() { _pal.dirtyMin = 0; _pal.dirtyMax = 255; }
 


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