thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed Screen::loadBitmap and Movie::open to take an optional Palette pointer instead of an optional array pointer.

Browse source 
svn-id: r41744
This commit is contained in:
Johannes Schickel 2009-06-22 02:37:20 +00:00
parent 73ea378dee
commit d2e5166dae
14 changed files with 61 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/kyra/staticres.cpp
View file

@ -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).getData());
_screen->loadBitmap("MAIN15.CPS", page, page, &_screen->getPalette(0));
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)