[Scummvm-cvs-logs] SF.net SVN: scummvm:[45090] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 45090
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45090&view=rev
Author:   m_kiewitz
Date:     2009-10-14 18:35:15 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
SCI/newgui: changed kPalette (setIntensity) to behave differently (seems we had it wrong) also changed nonsense clipping

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui.h
    scummvm/trunk/engines/sci/gui/gui_palette.cpp
    scummvm/trunk/engines/sci/gui/gui_palette.h
    scummvm/trunk/engines/sci/gui32/gui32.cpp
    scummvm/trunk/engines/sci/gui32/gui32.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-14 18:09:54 UTC (rev 45089)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-14 18:35:15 UTC (rev 45090)
@@ -581,12 +581,11 @@
 		break;
 	case 4:	{ // Set palette intensity
 		if (argc >= 4) {
-			int fromColor = CLIP<int>(1, 255, argv[1].toUint16());
-			int toColor = CLIP<int>(1, 255, argv[2].toUint16());
+			int fromColor = CLIP<int>(argv[1].toUint16(), 1, 255);
+			int toColor = CLIP<int>(argv[2].toUint16(), 1, 255);
 			int intensity = argv[3].toUint16();
-			bool setPalette = (argc < 5) ? true : (argv[5].isNull()) ? true : false;
 
-			s->_gui->paletteSetIntensity(fromColor, toColor, intensity, setPalette);
+			s->_gui->paletteSetIntensity(fromColor, toColor, intensity);
 		}
 		break;
 	}

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-14 18:09:54 UTC (rev 45089)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-14 18:35:15 UTC (rev 45090)
@@ -470,11 +470,8 @@
 	return _palette->matchColor(&_palette->_sysPalette, r, g, b) & 0xFF;
 }
 
-void SciGui::paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette) {
-	_palette->setIntensity(fromColor, toColor, intensity, &_palette->_sysPalette);
-	if (setPalette) {
-		_palette->setOnScreen();
-	}
+void SciGui::paletteSetIntensity(int fromColor, int toColor, int intensity) {
+	_palette->setIntensity(fromColor, toColor, intensity);
 }
 
 void SciGui::paletteAnimate(int fromColor, int toColor, int speed) {

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-14 18:09:54 UTC (rev 45089)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-14 18:35:15 UTC (rev 45090)
@@ -102,7 +102,7 @@
 
 	virtual void paletteSet(int resourceNo, int flags);
 	virtual int16 paletteFind(int r, int g, int b);
-	virtual void paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette);
+	virtual void paletteSetIntensity(int fromColor, int toColor, int intensity);
 	virtual void paletteAnimate(int fromColor, int toColor, int speed);
 
 	virtual void shakeScreen(uint16 shakeCount, uint16 directions);

Modified: scummvm/trunk/engines/sci/gui/gui_palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-14 18:09:54 UTC (rev 45089)
+++ scummvm/trunk/engines/sci/gui/gui_palette.cpp	2009-10-14 18:35:15 UTC (rev 45090)
@@ -275,8 +275,9 @@
 	_screen->setPalette(&_sysPalette);
 }
 
-void SciGuiPalette::setIntensity(int fromColor, int toColor, int intensity, GuiPalette *destPalette) {
-	memset(destPalette->intensity + fromColor, intensity, toColor - fromColor);
+void SciGuiPalette::setIntensity(int fromColor, int toColor, int intensity) {
+	memset(&_sysPalette.intensity + fromColor, intensity, toColor - fromColor);
+	setOnScreen();
 }
 
 void SciGuiPalette::animate(byte fromColor, byte toColor, int speed) {

Modified: scummvm/trunk/engines/sci/gui/gui_palette.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_palette.h	2009-10-14 18:09:54 UTC (rev 45089)
+++ scummvm/trunk/engines/sci/gui/gui_palette.h	2009-10-14 18:35:15 UTC (rev 45090)
@@ -47,7 +47,7 @@
 
 	void setOnScreen();
 
-	void setIntensity(int fromColor, int toColor, int intensity, GuiPalette *destPalette);
+	void setIntensity(int fromColor, int toColor, int intensity);
 	void animate(byte fromColor, byte toColor, int speed);
 
 	GuiPalette _sysPalette;

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-14 18:09:54 UTC (rev 45089)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-14 18:35:15 UTC (rev 45090)
@@ -1372,7 +1372,7 @@
 	return bestindex;
 }
 
-void SciGui32::paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette) {
+void SciGui32::paletteSetIntensity(int fromColor, int toColor, int intensity) {
 #if 0
 	_s->gfx_state->gfxResMan->setPaletteIntensity(fromColor, toColor, intensity);
 #endif

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-14 18:09:54 UTC (rev 45089)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-14 18:35:15 UTC (rev 45090)
@@ -80,7 +80,7 @@
 
 	void paletteSet(int resourceNo, int flags);
 	int16 paletteFind(int r, int g, int b);
-	void paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette);
+	void paletteSetIntensity(int fromColor, int toColor, int intensity);
 	void paletteAnimate(int fromColor, int toColor, int speed);
 
 	void shakeScreen(uint16 shakeCount, uint16 directions);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.