[Scummvm-cvs-logs] SF.net SVN: scummvm: [28884] scummvm/trunk/engines/agi/preagi_mickey.cpp

[thebluegr at users.sourceforge.net]

Revision: 28884
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28884&view=rev
Author:   thebluegr
Date:     2007-09-09 16:14:29 -0700 (Sun, 09 Sep 2007)

Log Message:
-----------
Some updates for the BCG Disney logo in Mickey

Modified Paths:
--------------
    scummvm/trunk/engines/agi/preagi_mickey.cpp

Modified: scummvm/trunk/engines/agi/preagi_mickey.cpp
===================================================================
--- scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-09 23:13:35 UTC (rev 28883)
+++ scummvm/trunk/engines/agi/preagi_mickey.cpp	2007-09-09 23:14:29 UTC (rev 28884)
@@ -841,27 +841,24 @@
 	drawRoomAnimation();
 }
 
-/*
-// TODO
-const uint32 colorBCG[16][2] = {
-	0x000000,	0x000000,	// 0 (black, black)
+const uint8 colorBCG[16][2] = {
+	0x00,	0x00,	// 0 (black, black)
 	0, 0,
-	0x000000,	0xFF00FF,	// 2 (black, purple)
-	0x000000,	0xFFFFFF,	// 3 (black, white)
+	0x00,	0x0D,	// 2 (black, purple)
+	0x00,	0xFF,	// 3 (black, white)
 	0, 0,
 	0, 0,
 	0, 0,
 	0, 0,
-	0xFF00FF,	0x000000,	// 8 (purple, black)
+	0x0D,	0x00,	// 8 (purple, black)
 	0, 0,
-	0xFF00FF,	0xFF00FF,	// A (purple, purple)
+	0x0D,	0x0D,	// A (purple, purple)
 	0, 0,
-	0xFFFFFF,	0x000000,	// C (white, black)
+	0xFF,	0x00,	// C (white, black)
 	0, 0,
 	0, 0,
-	0xFFFFFF,	0xFFFFFF	// F (white, white)
+	0xFF,	0xFF	// F (white, white)
 };
-*/
 
 void Mickey::drawLogo() {
 	char szFile[256] = {0};
@@ -885,10 +882,10 @@
 	// TODO: Show BCG picture
 	for (int y = 0; y < h; y++) {
 		for (int x = 0; x < w; x++) {
-			uint8 color  = (uint8)colorBCG[(bitmap[y][x] & 0xf0) / 0x10][0];	// background
-			uint8 color2 = (uint8)colorBCG[(bitmap[y][x] & 0xf0) / 0x10][1];	// background
-			uint8 color3 = (uint8)colorBCG[ bitmap[y][x] & 0x0f][0];			// foreground
-			uint8 color4 = (uint8)colorBCG[ bitmap[y][x] & 0x0f][1];			// foreground
+			uint8 color  = colorBCG[(bitmap[y][x] & 0xf0) / 0x10][0];	// background
+			uint8 color2 = colorBCG[(bitmap[y][x] & 0xf0) / 0x10][1];	// background
+			uint8 color3 = colorBCG[ bitmap[y][x] & 0x0f][0];			// foreground
+			uint8 color4 = colorBCG[ bitmap[y][x] & 0x0f][1];			// foreground
 
 			_vm->_picture->putPixel(x * 4,			y,		color);
 			_vm->_picture->putPixel(x * 4 + 1,		y,		color2);
@@ -903,6 +900,7 @@
 
 	_vm->_picture->showPic(10, 0, IDI_MSA_PIC_WIDTH, IDI_MSA_PIC_HEIGHT);
 	*/
+
 	//_vm->_gfx->doUpdate();
 	//_vm->_system->updateScreen();	// TODO: this should go in the game's main loop
 


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