diff options
| author | Johannes Schickel | 2009-06-22 02:35:45 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-06-22 02:35:45 +0000 |
| commit | 882662977f2cdf574e5aab041ceaaf626386d0f2 (patch) | |
| tree | 5c1bddf867152fe6d7c274416e8ddc2c4ea66e53 /engines/kyra/staticres.cpp | |
| parent | 9da52cb28280e0164db7073b0d3ea5abb4d20934 (diff) | |
| download | scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.tar.gz scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.tar.bz2 scummvm-rg350-882662977f2cdf574e5aab041ceaaf626386d0f2.zip | |
Changed Screen::getPalette to return a reference to a Palette object.
svn-id: r41741
Diffstat (limited to 'engines/kyra/staticres.cpp')
| -rw-r--r-- | engines/kyra/staticres.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 5a4f008a1a..38ade654e5 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -1584,7 +1584,7 @@ void KyraEngine_LoK::loadMainScreen(int page) { _screen->clearPage(page); if (_flags.lang == Common::EN_ANY && !_flags.isTalkie && (_flags.platform == Common::kPlatformPC || _flags.platform == Common::kPlatformAmiga)) - _screen->loadBitmap("MAIN15.CPS", page, page, _screen->getPalette(0)); + _screen->loadBitmap("MAIN15.CPS", page, page, _screen->getPalette(0).getData()); else if (_flags.lang == Common::EN_ANY || _flags.lang == Common::JA_JPN || (_flags.isTalkie && _flags.lang == Common::IT_ITA)) _screen->loadBitmap("MAIN_ENG.CPS", page, page, 0); else if (_flags.lang == Common::FR_FRA) @@ -1599,7 +1599,7 @@ void KyraEngine_LoK::loadMainScreen(int page) { warning("no main graphics file found"); if (_flags.platform == Common::kPlatformAmiga) - memcpy(_screen->getPalette(1), _screen->getPalette(0), 32*3); + _screen->getPalette(1).copy(_screen->getPalette(0)); _screen->copyRegion(0, 0, 0, 0, 320, 200, page, 0); } |