diff options
| author | Johannes Schickel | 2009-06-22 02:37:20 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-22 02:37:20 +0000 |
| commit | d2e5166dae41d8972151ba3d1471ceace4323478 (patch) | |
| tree | 44ade291f259c93fe7d818a28efd4bece4ff2dc3 /engines/kyra/lol.cpp | |
| parent | 73ea378dee4e7ec31c7a898e7fcc3a65a9eb6cc1 (diff) | |
| download | scummvm-rg350-d2e5166dae41d8972151ba3d1471ceace4323478.tar.gz scummvm-rg350-d2e5166dae41d8972151ba3d1471ceace4323478.tar.bz2 scummvm-rg350-d2e5166dae41d8972151ba3d1471ceace4323478.zip | |
Changed Screen::loadBitmap and Movie::open to take an optional Palette pointer instead of an optional array pointer.
svn-id: r41744
Diffstat (limited to 'engines/kyra/lol.cpp')
| -rw-r--r-- | engines/kyra/lol.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 66668ce08e..216fad9122 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -778,7 +778,7 @@ int LoLEngine::mainMenu() { void LoLEngine::startup() { _screen->clearPage(0); - _screen->loadBitmap("PLAYFLD.CPS", 3, 3, _screen->getPalette(0).getData()); + _screen->loadBitmap("PLAYFLD.CPS", 3, 3, &_screen->getPalette(0)); uint8 *tmpPal = new uint8[0x300]; memcpy(tmpPal, _screen->getPalette(0).getData(), 0x300); @@ -3842,7 +3842,7 @@ void LoLEngine::displayAutomap() { uint8 *tmpWll = new uint8[80]; memcpy(tmpWll, _wllBuffer4, 80); - _screen->loadBitmap("parch.cps", 2, 2, _screen->getPalette(3).getData()); + _screen->loadBitmap("parch.cps", 2, 2, &_screen->getPalette(3)); _screen->loadBitmap("autobut.shp", 3, 5, 0); const uint8 *shp = _screen->getCPagePtr(5); @@ -4010,7 +4010,7 @@ void LoLEngine::loadMapLegendData(int level) { void LoLEngine::drawMapPage(int pageNum) { for (int i = 0; i < 2; i++) { - _screen->loadBitmap("parch.cps", pageNum, pageNum, _screen->getPalette(3).getData()); + _screen->loadBitmap("parch.cps", pageNum, pageNum, &_screen->getPalette(3)); int cp = _screen->setCurPage(pageNum); Screen::FontId of = _screen->setFont(Screen::FID_9_FNT); |