[Scummvm-cvs-logs] SF.net SVN: scummvm:[47578] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Tue Jan 26 23:45:53 CET 2010
Revision: 47578
http://scummvm.svn.sourceforge.net/scummvm/?rev=47578&view=rev
Author: m_kiewitz
Date: 2010-01-26 22:45:52 +0000 (Tue, 26 Jan 2010)
Log Message:
-----------
SCI: changed flags (uint16) to force (bool) for set/merge palette methods
Modified Paths:
--------------
scummvm/trunk/engines/sci/console.cpp
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/graphics/gui.cpp
scummvm/trunk/engines/sci/graphics/gui.h
scummvm/trunk/engines/sci/graphics/palette.cpp
scummvm/trunk/engines/sci/graphics/palette.h
scummvm/trunk/engines/sci/graphics/picture.cpp
scummvm/trunk/engines/sci/graphics/portrait.cpp
scummvm/trunk/engines/sci/graphics/view.cpp
Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/console.cpp 2010-01-26 22:45:52 UTC (rev 47578)
@@ -994,7 +994,7 @@
uint16 resourceId = atoi(argv[1]);
- _vm->_gamestate->_gui->paletteSet(resourceId, 2);
+ _vm->_gamestate->_gui->paletteSet(resourceId, true);
return true;
}
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2010-01-26 22:45:52 UTC (rev 47578)
@@ -524,8 +524,8 @@
case 1: // Set resource palette
if (argc==3) {
GuiResourceId resourceId = argv[1].toUint16();
- uint16 flags = argv[2].toUint16();
- s->_gui->paletteSet(resourceId, flags);
+ bool force = argv[2].toUint16() == 2 ? true : false;
+ s->_gui->paletteSet(resourceId, force);
}
break;
case 2: { // Set palette-flag(s)
Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp 2010-01-26 22:45:52 UTC (rev 47578)
@@ -566,11 +566,11 @@
}
-void SciGui::paletteSet(GuiResourceId resourceId, uint16 flags) {
+void SciGui::paletteSet(GuiResourceId resourceId, bool force) {
// we are also called on EGA games as well, this doesnt make sense. doing this would actually break the system EGA palette
if (!_s->resMan->isVGA())
return;
- _palette->setFromResource(resourceId, flags);
+ _palette->setFromResource(resourceId, force);
}
void SciGui::paletteSetFlag(uint16 fromColor, uint16 toColor, uint16 flag) {
@@ -890,7 +890,7 @@
_palVaryId = -1; // invalidate the target palette
// HACK: just set the target palette
- _palette->setFromResource(_palVaryId, 2);
+ _palette->setFromResource(_palVaryId, true);
}
void SciGui::palVaryCallback(void *refCon) {
Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/graphics/gui.h 2010-01-26 22:45:52 UTC (rev 47578)
@@ -110,7 +110,7 @@
virtual int16 picNotValid(int16 newPicNotValid);
- virtual void paletteSet(GuiResourceId resourceNo, uint16 flags);
+ virtual void paletteSet(GuiResourceId resourceNo, bool force);
virtual void paletteSetFlag(uint16 fromColor, uint16 toColor, uint16 flag);
virtual void paletteUnsetFlag(uint16 fromColor, uint16 toColor, uint16 flag);
virtual int16 paletteFind(uint16 r, uint16 g, uint16 b);
Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp 2010-01-26 22:45:52 UTC (rev 47578)
@@ -59,7 +59,7 @@
else if (_resMan->isAmiga32color())
setAmiga();
else
- setFromResource(999, 2);
+ setFromResource(999, true);
}
}
@@ -185,29 +185,29 @@
setOnScreen();
}
-bool SciPalette::setFromResource(GuiResourceId resourceId, uint16 flag) {
+bool SciPalette::setFromResource(GuiResourceId resourceId, bool force) {
Resource *palResource = _resMan->findResource(ResourceId(kResourceTypePalette, resourceId), 0);
Palette palette;
if (palResource) {
createFromData(palResource->data, &palette);
- set(&palette, 2);
+ set(&palette, true);
return true;
}
return false;
}
-void SciPalette::set(Palette *sciPal, uint16 flag, bool forceRealMerge) {
+void SciPalette::set(Palette *sciPal, bool force, bool forceRealMerge) {
uint32 systime = _sysPalette.timestamp;
- if (flag == 2 || sciPal->timestamp != systime) {
- merge(sciPal, &_sysPalette, flag, forceRealMerge);
+ if (force || sciPal->timestamp != systime) {
+ merge(sciPal, &_sysPalette, force, forceRealMerge);
sciPal->timestamp = _sysPalette.timestamp;
if (_screen->_picNotValid == 0 && systime != _sysPalette.timestamp)
setOnScreen();
}
}
-void SciPalette::merge(Palette *pFrom, Palette *pTo, uint16 flag, bool forceRealMerge) {
+void SciPalette::merge(Palette *pFrom, Palette *pTo, bool force, bool forceRealMerge) {
uint16 res;
int i,j;
@@ -228,7 +228,7 @@
if (!pFrom->colors[i].used)// color is not used - so skip it
continue;
// forced palette merging or dest color is not used yet or bit 1 of new color is set
- if (flag == 2 || (!pTo->colors[i].used) || (pFrom->colors[i].used & 2)) {
+ if (force || (!pTo->colors[i].used) || (pFrom->colors[i].used & 2)) {
pTo->colors[i].used = pFrom->colors[i].used;
pTo->colors[i].r = pFrom->colors[i].r;
pTo->colors[i].g = pFrom->colors[i].g;
Modified: scummvm/trunk/engines/sci/graphics/palette.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.h 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/graphics/palette.h 2010-01-26 22:45:52 UTC (rev 47578)
@@ -40,9 +40,9 @@
bool setAmiga();
void modifyAmigaPalette(byte *data);
void setEGA();
- bool setFromResource(GuiResourceId resourceId, uint16 flag);
- void set(Palette *sciPal, uint16 flag, bool forceRealMerge = false);
- void merge(Palette *pFrom, Palette *pTo, uint16 flag, bool forceRealMerge);
+ bool setFromResource(GuiResourceId resourceId, bool force);
+ void set(Palette *sciPal, bool force, bool forceRealMerge = false);
+ void merge(Palette *pFrom, Palette *pTo, bool force, bool forceRealMerge);
uint16 matchColor(Palette *pPal, byte r, byte g, byte b);
void getSys(Palette *pal);
Modified: scummvm/trunk/engines/sci/graphics/picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/picture.cpp 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/graphics/picture.cpp 2010-01-26 22:45:52 UTC (rev 47578)
@@ -102,7 +102,7 @@
// Create palette and set it
_palette->createFromData(inbuffer + palette_data_ptr, &palette);
- _palette->set(&palette, 2);
+ _palette->set(&palette, true);
// display Cel-data
if (has_cel) {
@@ -130,7 +130,7 @@
// Create palette and set it
_palette->createFromData(inbuffer + palette_data_ptr, &palette);
- _palette->set(&palette, 2);
+ _palette->set(&palette, true);
while (celCount > 0) {
cel_RlePos = READ_LE_UINT16(inbuffer + cel_headerPos + 24);
@@ -570,7 +570,7 @@
palette.colors[i].used = data[curPos++];
palette.colors[i].r = data[curPos++]; palette.colors[i].g = data[curPos++]; palette.colors[i].b = data[curPos++];
}
- _palette->set(&palette, 2);
+ _palette->set(&palette, true);
}
break;
case PIC_OPX_VGA_EMBEDDED_VIEW: // draw cel
Modified: scummvm/trunk/engines/sci/graphics/portrait.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/portrait.cpp 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/graphics/portrait.cpp 2010-01-26 22:45:52 UTC (rev 47578)
@@ -140,7 +140,7 @@
uint syncOffset = 0;
// Set the portrait palette
- _palette->set(&_portraitPalette, 1, true);
+ _palette->set(&_portraitPalette, false, true);
// Draw base bitmap
drawBitmap(0);
Modified: scummvm/trunk/engines/sci/graphics/view.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/view.cpp 2010-01-26 22:34:17 UTC (rev 47577)
+++ scummvm/trunk/engines/sci/graphics/view.cpp 2010-01-26 22:45:52 UTC (rev 47578)
@@ -493,7 +493,7 @@
if (_embeddedPal) {
// Merge view palette in...
- _palette->set(&_viewPalette, 1);
+ _palette->set(&_viewPalette, false);
}
width = MIN(clipRect.width(), celWidth);
@@ -545,7 +545,7 @@
if (_embeddedPal) {
// Merge view palette in...
- _palette->set(&_viewPalette, 1);
+ _palette->set(&_viewPalette, false);
}
scaledWidth = (celInfo->width * scaleX) >> 7;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list