diff options
| author | Filippos Karapetis | 2007-09-09 23:14:29 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-09-09 23:14:29 +0000 |
| commit | 2b643875aee54a0dc8647109d2c07994e33d32e2 (patch) | |
| tree | 38b487a4a4f01c6eec703fdc130c5b7cbcb8e21b /engines/agi/preagi_mickey.cpp | |
| parent | a86ad9688a450b98686d6c643e3d28d047da867b (diff) | |
| download | scummvm-rg350-2b643875aee54a0dc8647109d2c07994e33d32e2.tar.gz scummvm-rg350-2b643875aee54a0dc8647109d2c07994e33d32e2.tar.bz2 scummvm-rg350-2b643875aee54a0dc8647109d2c07994e33d32e2.zip | |
Some updates for the BCG Disney logo in Mickey
svn-id: r28884
Diffstat (limited to 'engines/agi/preagi_mickey.cpp')
| -rw-r--r-- | engines/agi/preagi_mickey.cpp | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/engines/agi/preagi_mickey.cpp b/engines/agi/preagi_mickey.cpp index ef56272d92..1cf29adf53 100644 --- a/engines/agi/preagi_mickey.cpp +++ b/engines/agi/preagi_mickey.cpp @@ -841,27 +841,24 @@ void Mickey::drawRoom() { 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 @@ void Mickey::drawLogo() { // 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 @@ void Mickey::drawLogo() { _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 |