diff options
| author | Bendegúz Nagy | 2016-08-11 17:58:42 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 181995cff9a521fb659aadc802d6cd65233385f2 (patch) | |
| tree | d881ce6f0acc4f8717ea05604ce9b8998ad6c522 /engines/dm | |
| parent | 94ba2fdb2bec8c0a9bf58ded78fd40f6b95aa28c (diff) | |
| download | scummvm-rg350-181995cff9a521fb659aadc802d6cd65233385f2.tar.gz scummvm-rg350-181995cff9a521fb659aadc802d6cd65233385f2.tar.bz2 scummvm-rg350-181995cff9a521fb659aadc802d6cd65233385f2.zip | |
DM: Deprecate DisplayMan::loadPalette
Diffstat (limited to 'engines/dm')
| -rw-r--r-- | engines/dm/gfx.cpp | 12 | ||||
| -rw-r--r-- | engines/dm/gfx.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index 832b336e91..e42e2282a1 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -1063,23 +1063,11 @@ void DisplayMan::f565_viewportSetPalette(uint16* middleScreenPalette, uint16* to } void DisplayMan::f566_viewportBlitToScreen() { - warning(false, "MISSING FUNCTIONALITY: using correct colorpalette"); Box box(0, 223, 33, 33 + 135); f132_blitToBitmap(_g296_bitmapViewport, _g348_bitmapScreen, box, 0, 0, k112_byteWidthViewport, k160_byteWidthScreen, kM1_ColorNoTransparency); } -void DisplayMan::loadPalette(uint16 *palette) { - byte colorPalette[16 * 3]; - for (int i = 0; i < 16; ++i) { - colorPalette[i * 3] = (palette[i] >> 8) * (256 / 16); - colorPalette[i * 3 + 1] = (palette[i] >> 4) * (256 / 16); - colorPalette[i * 3 + 2] = palette[i] * (256 / 16); - } - _vm->_system->getPaletteManager()->setPalette(colorPalette, 0, 16); -} - - void DisplayMan::f466_loadIntoBitmap(uint16 index, byte *destBitmap) { uint8 *data = _packedBitmaps + _packedItemPos[index]; uint16 width = READ_BE_UINT16(data); diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 564bfb6ba8..af8b0d3c03 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -656,7 +656,6 @@ public: void f479_loadGraphics(); // @ F0479_MEMORY_ReadGraphicsDatHeader void f460_initializeGraphicData(); // @ F0460_START_InitializeGraphicData void f96_loadCurrentMapGraphics(); // @ F0096_DUNGEONVIEW_LoadCurrentMapGraphics_CPSDF - void loadPalette(uint16 *palette); void f461_allocateFlippedWallBitmaps(); // @ F0461_START_AllocateFlippedWallBitmaps void f102_drawDoorBitmap(Frame *frame);// @ F0102_DUNGEONVIEW_DrawDoorBitmap void f103_drawDoorFrameBitmapFlippedHorizontally(byte *bitmap, Frame *frame); // @ F0103_DUNGEONVIEW_DrawDoorFrameBitmapFlippedHorizontally |