libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 02:17:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SCI: cleanup of SciPalette

Browse Source 
svn-id: r50091
This commit is contained in:
Martin Kiewitz 2010-06-20 19:18:33 +00:00
parent 05e2bbcc33
commit d37a25cfee
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/sci/graphics/palette.cpp
View File

@ -342,8 +342,6 @@ void GfxPalette::getSys(Palette *pal) {
} }
void GfxPalette::setOnScreen() { void GfxPalette::setOnScreen() {
// if (pal != &_sysPalette)
// memcpy(&_sysPalette,pal,sizeof(Palette));
// We dont change palette at all times for amiga // We dont change palette at all times for amiga
if (_resMan->isAmiga32color()) if (_resMan->isAmiga32color())
return; return;
@ -355,7 +353,7 @@ void GfxPalette::setOnScreen() {
} }
bool GfxPalette::kernelSetFromResource(GuiResourceId resourceId, bool force) { 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; Palette palette;
if (palResource) { if (palResource) {
@ -496,13 +494,11 @@ void GfxPalette::palVaryInstallTimer() {
} }
bool GfxPalette::kernelPalVaryInit(GuiResourceId resourceId, uint16 ticks, uint16 stepStop, uint16 direction) { bool GfxPalette::kernelPalVaryInit(GuiResourceId resourceId, uint16 ticks, uint16 stepStop, uint16 direction) {
//kernelSetFromResource(resourceId, true);
//return;
if (_palVaryResourceId != -1) // another palvary is taking place, return if (_palVaryResourceId != -1) // another palvary is taking place, return
return false; return false;
_palVaryResourceId = resourceId; _palVaryResourceId = resourceId;
Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), 0); Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), false);
if (palResource) { if (palResource) {
// Load and initialize destination palette // Load and initialize destination palette
createFromData(palResource->data, &_palVaryTargetPalette); createFromData(palResource->data, &_palVaryTargetPalette);