diff options
| author | Walter van Niftrik | 2016-03-04 22:35:12 +0100 |
|---|---|---|
| committer | Walter van Niftrik | 2016-03-09 10:03:13 +0100 |
| commit | 6f9128983847d78a41da7cf2f16a1243c7c1fa28 (patch) | |
| tree | 681e6a64c8f2b2b3fe4ea0ee0c9d38c03f3f42fe | |
| parent | e6d478ad150f7eb702f12c8d3a60bfcd416f2b2e (diff) | |
| download | scummvm-rg350-6f9128983847d78a41da7cf2f16a1243c7c1fa28.tar.gz scummvm-rg350-6f9128983847d78a41da7cf2f16a1243c7c1fa28.tar.bz2 scummvm-rg350-6f9128983847d78a41da7cf2f16a1243c7c1fa28.zip | |
ADL: Clean up Display class
| -rw-r--r-- | engines/adl/display.cpp | 14 | ||||
| -rw-r--r-- | engines/adl/display.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/adl/display.cpp b/engines/adl/display.cpp index 05c96cfcda..e8ea8211ce 100644 --- a/engines/adl/display.cpp +++ b/engines/adl/display.cpp @@ -106,7 +106,7 @@ Display::Display() : else g_system->getPaletteManager()->setPalette(colorPalette, 0, COLOR_PALETTE_ENTRIES); - enableScanlines(_scanlines); + showScanlines(_scanlines); _frameBuf = new byte[DISPLAY_PITCH * DISPLAY_HEIGHT]; _frameBufSurface = new Graphics::Surface; @@ -169,14 +169,14 @@ void Display::updateHiResScreen() { bool Display::saveThumbnail(Common::WriteStream &out) { if (_scanlines) { - enableScanlines(false); + showScanlines(false); g_system->updateScreen(); } bool retval = Graphics::saveThumbnail(out); if (_scanlines) { - enableScanlines(true); + showScanlines(true); g_system->updateScreen(); } @@ -280,14 +280,14 @@ void Display::showCursor(bool enable) { _showCursor = enable; } -void Display::enableScanlines(bool enable) { +void Display::showScanlines(bool enable) { byte pal[COLOR_PALETTE_ENTRIES * 3] = { }; if (enable) - g_system->getPaletteManager()->setPalette(pal, 6, 6); + g_system->getPaletteManager()->setPalette(pal, COLOR_PALETTE_ENTRIES, COLOR_PALETTE_ENTRIES); else { - g_system->getPaletteManager()->grabPalette(pal, 0, 6); - g_system->getPaletteManager()->setPalette(pal, 6, 6); + g_system->getPaletteManager()->grabPalette(pal, 0, COLOR_PALETTE_ENTRIES); + g_system->getPaletteManager()->setPalette(pal, COLOR_PALETTE_ENTRIES, COLOR_PALETTE_ENTRIES); } } diff --git a/engines/adl/display.h b/engines/adl/display.h index 16b52bf9a3..b93128f6a5 100644 --- a/engines/adl/display.h +++ b/engines/adl/display.h @@ -79,7 +79,7 @@ private: }; void updateHiResSurface(); - void enableScanlines(bool enable); + void showScanlines(bool enable); void decodeScanlineColor(byte *dst, int pitch, byte *src) const; void decodeScanlineMono(byte *dst, int pitch, byte *src) const; void decodeScanline(byte *dst, int pitch, byte *src) const; |