SCI/newgui: kPalette / setIntensity / reimplemented setPalette optional parameter, fixed memory corruption in setIntensity

svn-id: r45091

5 files changed, 13 insertions, 11 deletions

diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index d10a779bdb..22492d1718 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -581,11 +581,12 @@ reg_t kPalette(EngineState *s, int argc, reg_t *argv) {
 		break;
 	case 4:	{ // Set palette intensity
 		if (argc >= 4) {
-			int fromColor = CLIP<int>(argv[1].toUint16(), 1, 255);
-			int toColor = CLIP<int>(argv[2].toUint16(), 1, 255);
-			int intensity = argv[3].toUint16();
+			int16 fromColor = CLIP<int>(argv[1].toUint16(), 1, 255);
+			int16 toColor = CLIP<int>(argv[2].toUint16(), 1, 255);
+			int16 intensity = argv[3].toUint16();
+			bool setPalette = (argc < 5) ? true : (argv[4].isNull()) ? true : false;
 
-			s->_gui->paletteSetIntensity(fromColor, toColor, intensity);
+			s->_gui->paletteSetIntensity(fromColor, toColor, intensity, setPalette);
 		}
 		break;
 	}
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 97236e1206..dcf3d5f706 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -470,8 +470,8 @@ int16 SciGui::paletteFind(int r, int g, int b) {
 	return _palette->matchColor(&_palette->_sysPalette, r, g, b) & 0xFF;
 }
 
-void SciGui::paletteSetIntensity(int fromColor, int toColor, int intensity) {
-	_palette->setIntensity(fromColor, toColor, intensity);
+void SciGui::paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette) {
+	_palette->setIntensity(fromColor, toColor, intensity, setPalette);
 }
 
 void SciGui::paletteAnimate(int fromColor, int toColor, int speed) {
diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h
index c74f860120..3073aeed38 100644
--- a/engines/sci/gui/gui.h
+++ b/engines/sci/gui/gui.h
@@ -102,7 +102,7 @@ public:
 
 	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);
+	virtual void paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette);
 	virtual void paletteAnimate(int fromColor, int toColor, int speed);
 
 	virtual void shakeScreen(uint16 shakeCount, uint16 directions);
diff --git a/engines/sci/gui/gui_palette.cpp b/engines/sci/gui/gui_palette.cpp
index 6cd7a432cd..f413f66766 100644
--- a/engines/sci/gui/gui_palette.cpp
+++ b/engines/sci/gui/gui_palette.cpp
@@ -275,9 +275,10 @@ void SciGuiPalette::setOnScreen() {
 	_screen->setPalette(&_sysPalette);
 }
 
-void SciGuiPalette::setIntensity(int fromColor, int toColor, int intensity) {
-	memset(&_sysPalette.intensity + fromColor, intensity, toColor - fromColor);
-	setOnScreen();
+void SciGuiPalette::setIntensity(int fromColor, int toColor, int intensity, bool setPalette) {
+	memset(&_sysPalette.intensity[0] + fromColor, intensity, toColor - fromColor);
+	if (setPalette)
+		setOnScreen();
 }
 
 void SciGuiPalette::animate(byte fromColor, byte toColor, int speed) {
diff --git a/engines/sci/gui/gui_palette.h b/engines/sci/gui/gui_palette.h
index 8cd0a5695b..fa050c03bf 100644
--- a/engines/sci/gui/gui_palette.h
+++ b/engines/sci/gui/gui_palette.h
@@ -47,7 +47,7 @@ public:
 
 	void setOnScreen();
 
-	void setIntensity(int fromColor, int toColor, int intensity);
+	void setIntensity(int fromColor, int toColor, int intensity, bool setPalette);
 	void animate(byte fromColor, byte toColor, int speed);
 
 	GuiPalette _sysPalette;