SCI/newgui: kPalette cleanup, preparing for sq5 paletteAnimate support

svn-id: r45273

2 files changed, 8 insertions, 8 deletions

diff --git a/engines/sci/gui32/gui32.cpp b/engines/sci/gui32/gui32.cpp
index 82fc341a85..a5a7987d8b 100644
--- a/engines/sci/gui32/gui32.cpp
+++ b/engines/sci/gui32/gui32.cpp
@@ -1342,11 +1342,11 @@ int16 SciGui32::picNotValid(int16 newPicNotValid) {
 	return oldPicNotValid;
 }
 
-void SciGui32::paletteSet(int resourceNo, int flags) {
+void SciGui32::paletteSet(GuiResourceId resourceNo, uint16 flags) {
 	//warning("STUB");
 }
 
-int16 SciGui32::paletteFind(int r, int g, int b) {
+int16 SciGui32::paletteFind(uint16 r, uint16 g, uint16 b) {
 	int i, delta, bestindex = -1, bestdelta = 200000;
 
 	for (i = 0; i < _s->gfx_state->gfxResMan->getColorCount(); i++) {
@@ -1366,13 +1366,13 @@ int16 SciGui32::paletteFind(int r, int g, int b) {
 	return bestindex;
 }
 
-void SciGui32::paletteSetIntensity(int fromColor, int toColor, int intensity) {
+void SciGui32::paletteSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity) {
 #if 0
 	_s->gfx_state->gfxResMan->setPaletteIntensity(fromColor, toColor, intensity);
 #endif
 }
 
-void SciGui32::paletteAnimate(int fromColor, int toColor, int speed) {
+void SciGui32::paletteAnimate(uint16 fromColor, uint16 toColor, uint16 speed) {
 	//warning("STUB");
 }
 
diff --git a/engines/sci/gui32/gui32.h b/engines/sci/gui32/gui32.h
index da4aa229b6..3f7d12e80c 100644
--- a/engines/sci/gui32/gui32.h
+++ b/engines/sci/gui32/gui32.h
@@ -78,10 +78,10 @@ public:
 
 	int16 picNotValid(int16 newPicNotValid);
 
-	void paletteSet(int resourceNo, int flags);
-	int16 paletteFind(int r, int g, int b);
-	void paletteSetIntensity(int fromColor, int toColor, int intensity);
-	void paletteAnimate(int fromColor, int toColor, int speed);
+	void paletteSet(GuiResourceId resourceNo, uint16 flags);
+	int16 paletteFind(uint16 r, uint16 g, uint16 b);
+	void paletteSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity);
+	void paletteAnimate(uint16 fromColor, uint16 toColor, uint16 speed);
 
 	void shakeScreen(uint16 shakeCount, uint16 directions);