diff options
author | Martin Kiewitz | 2010-06-20 19:18:33 +0000 |
---|---|---|
committer | Martin Kiewitz | 2010-06-20 19:18:33 +0000 |
commit | d37a25cfee6832e7b92abaa693531e496b83a3c2 (patch) | |
tree | d40f4b80af4d133b34c5e1e2e2ccde35487dff9c /engines/sci | |
parent | 05e2bbcc333afd73a5671980a90f70e0e0fb9506 (diff) | |
download | scummvm-rg350-d37a25cfee6832e7b92abaa693531e496b83a3c2.tar.gz scummvm-rg350-d37a25cfee6832e7b92abaa693531e496b83a3c2.tar.bz2 scummvm-rg350-d37a25cfee6832e7b92abaa693531e496b83a3c2.zip |
SCI: cleanup of SciPalette
svn-id: r50091
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/graphics/palette.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index 94e847014f..abe6043f29 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -342,8 +342,6 @@ void GfxPalette::getSys(Palette *pal) { } void GfxPalette::setOnScreen() { -// if (pal != &_sysPalette) -// memcpy(&_sysPalette,pal,sizeof(Palette)); // We dont change palette at all times for amiga if (_resMan->isAmiga32color()) return; @@ -355,7 +353,7 @@ void GfxPalette::setOnScreen() { } bool GfxPalette::kernelSetFromResource(GuiResourceId resourceId, bool force) { - Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), 0); + Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), false); Palette palette; if (palResource) { @@ -496,13 +494,11 @@ void GfxPalette::palVaryInstallTimer() { } bool GfxPalette::kernelPalVaryInit(GuiResourceId resourceId, uint16 ticks, uint16 stepStop, uint16 direction) { - //kernelSetFromResource(resourceId, true); - //return; if (_palVaryResourceId != -1) // another palvary is taking place, return return false; _palVaryResourceId = resourceId; - Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), 0); + Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), false); if (palResource) { // Load and initialize destination palette createFromData(palResource->data, &_palVaryTargetPalette); |