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

[m_kiewitz at users.sourceforge.net]

Revision: 47753
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47753&view=rev
Author:   m_kiewitz
Date:     2010-01-31 16:26:15 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
SCI: renamed kernelFind() to kernelFindColor, so that it isnt that confusing :P

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/kpathing.cpp
    scummvm/trunk/engines/sci/graphics/palette.cpp
    scummvm/trunk/engines/sci/graphics/palette.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-31 16:21:11 UTC (rev 47752)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-31 16:26:15 UTC (rev 47753)
@@ -668,7 +668,7 @@
 		uint16 g = argv[2].toUint16();
 		uint16 b = argv[3].toUint16();
 
-		return make_reg(0, s->_gfxPalette->kernelFind(r, g, b));
+		return make_reg(0, s->_gfxPalette->kernelFindColor(r, g, b));
 	}
 	case 6: { // Animate
 		int16 argNr;

Modified: scummvm/trunk/engines/sci/engine/kpathing.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.cpp	2010-01-31 16:21:11 UTC (rev 47752)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp	2010-01-31 16:26:15 UTC (rev 47753)
@@ -293,10 +293,10 @@
 	// Red : Barred access
 	// Yellow: Contained access
 	int poly_colors[4] = {
-		s->_gfxPalette->kernelFind(0, 255, 0),	// green
-		s->_gfxPalette->kernelFind(0, 0, 255),	// blue
-		s->_gfxPalette->kernelFind(255, 0, 0),	// red
-		s->_gfxPalette->kernelFind(255, 255, 0)	// yellow
+		s->_gfxPalette->kernelFindColor(0, 255, 0),	// green
+		s->_gfxPalette->kernelFindColor(0, 0, 255),	// blue
+		s->_gfxPalette->kernelFindColor(255, 0, 0),	// red
+		s->_gfxPalette->kernelFindColor(255, 255, 0)	// yellow
 	};
 
 	// Clip
@@ -315,8 +315,8 @@
 	// Green: End point
 	// Blue: Starting point
 	int point_colors[2] = {
-		s->_gfxPalette->kernelFind(0, 255, 0),	// green
-		s->_gfxPalette->kernelFind(0, 0, 255)		// blue
+		s->_gfxPalette->kernelFindColor(0, 255, 0),	// green
+		s->_gfxPalette->kernelFindColor(0, 0, 255)		// blue
 	};
 
 	Common::Rect rect = Common::Rect(p.x - 1, p.y - 1, p.x - 1 + 3, p.y - 1 + 3);

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-31 16:21:11 UTC (rev 47752)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-01-31 16:26:15 UTC (rev 47753)
@@ -328,7 +328,7 @@
 		setOnScreen();
 }
 
-int16 GfxPalette::kernelFind(uint16 r, uint16 g, uint16 b) {
+int16 GfxPalette::kernelFindColor(uint16 r, uint16 g, uint16 b) {
 	return matchColor(&_sysPalette, r, g, b) & 0xFF;
 }
 

Modified: scummvm/trunk/engines/sci/graphics/palette.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.h	2010-01-31 16:21:11 UTC (rev 47752)
+++ scummvm/trunk/engines/sci/graphics/palette.h	2010-01-31 16:26:15 UTC (rev 47753)
@@ -51,7 +51,7 @@
 	void kernelSetFlag(uint16 fromColor, uint16 toColor, uint16 flag);
 	void kernelUnsetFlag(uint16 fromColor, uint16 toColor, uint16 flag);
 	void kernelSetIntensity(uint16 fromColor, uint16 toColor, uint16 intensity, bool setPalette);
-	int16 GfxPalette::kernelFind(uint16 r, uint16 g, uint16 b);
+	int16 GfxPalette::kernelFindColor(uint16 r, uint16 g, uint16 b);
 	bool kernelAnimate(byte fromColor, byte toColor, int speed);
 	void kernelAnimateSet();
 


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