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

SCI32: Split GfxPalette and GfxPalette32 + HunkPalette

Browse source
This commit is contained in:
Colin Snover 2016-07-09 12:41:12 -05:00
parent 7f53a26d9e
commit 4cfc387602
10 changed files with 336 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/sci/sci.cpp
View file

@ -167,9 +167,7 @@ SciEngine::~SciEngine() {
DebugMan.clearAllDebugChannels();
#ifdef ENABLE_SCI32
// _gfxPalette32 is the same as _gfxPalette16
// and will be destroyed when _gfxPalette16 is
// destroyed
delete _gfxPalette32;
delete _gfxControls32;
delete _gfxPaint32;
delete _gfxText32;
@ -717,8 +715,7 @@ void SciEngine::initGraphics() {
#ifdef ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2) {
_gfxPalette32 = new GfxPalette32(_resMan, _gfxScreen);
_gfxPalette16 = _gfxPalette32;
_gfxPalette32 = new GfxPalette32(_resMan);
_gfxRemap32 = new GfxRemap32();
} else {
#endif
@ -767,8 +764,10 @@ void SciEngine::initGraphics() {
}
#endif
// Set default (EGA, amiga or resource 999) palette
_gfxPalette16->setDefault();
if (getSciVersion() < SCI_VERSION_2) {
// Set default (EGA, amiga or resource 999) palette
_gfxPalette16->setDefault();
}
}
void SciEngine::initStackBaseWithSelector(Selector selector) {