diff options
author | Johannes Schickel | 2009-06-29 16:49:53 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-06-29 16:49:53 +0000 |
commit | 179a822b93b3bd4c5ff462441fdf1ca53f672b9d (patch) | |
tree | af5e665a2bd9804775693a75d8aa488bb3817ae5 /engines/kyra/lol.cpp | |
parent | 07cdbd273db8887778a0b15048679ee78b2d72ce (diff) | |
download | scummvm-rg350-179a822b93b3bd4c5ff462441fdf1ca53f672b9d.tar.gz scummvm-rg350-179a822b93b3bd4c5ff462441fdf1ca53f672b9d.tar.bz2 scummvm-rg350-179a822b93b3bd4c5ff462441fdf1ca53f672b9d.zip |
Adapted various code parts to use Palette::fill.
svn-id: r41953
Diffstat (limited to 'engines/kyra/lol.cpp')
-rw-r--r-- | engines/kyra/lol.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 8f4bfaa87a..020e1ea3ea 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -778,17 +778,17 @@ int LoLEngine::mainMenu() { void LoLEngine::startup() { _screen->clearPage(0); - _screen->loadBitmap("PLAYFLD.CPS", 3, 3, &_screen->getPalette(0)); - - uint8 *tmpPal = new uint8[0x300]; - memcpy(tmpPal, _screen->getPalette(0).getData(), 0x300); - memset(_screen->getPalette(0).getData(), 0x3f, 0x180); - _screen->getPalette(0).copy(tmpPal, 1, 1); - memset(_screen->getPalette(0).getData() + 0x240, 0x3f, 12); - _screen->generateOverlay(_screen->getPalette(0), _screen->_paletteOverlay1, 1, 96); - _screen->generateOverlay(_screen->getPalette(0), _screen->_paletteOverlay2, 144, 65); - _screen->getPalette(0).copy(tmpPal, 0, 256); - delete[] tmpPal; + + Palette &pal = _screen->getPalette(0); + _screen->loadBitmap("PLAYFLD.CPS", 3, 3, &pal); + + _screen->copyPalette(1, 0); + pal.fill(0, 1, 0x3F); + pal.fill(2, 126, 0x3F); + pal.fill(192, 4, 0x3F); + _screen->generateOverlay(pal, _screen->_paletteOverlay1, 1, 96); + _screen->generateOverlay(pal, _screen->_paletteOverlay2, 144, 65); + _screen->copyPalette(0, 1); _screen->getPalette(1).clear(); _screen->getPalette(2).clear(); |