diff options
| author | Martin Kiewitz | 2010-01-31 16:26:15 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-31 16:26:15 +0000 |
| commit | 7184fa3bade28876787422e280f5475e7b23575d (patch) | |
| tree | 799dfb8ad9b37fe8113e83900ed5ba4c6e304237 /engines/sci/graphics | |
| parent | 72c2d360f748d5c9934db2edf3c672bac7b1e165 (diff) | |
| download | scummvm-rg350-7184fa3bade28876787422e280f5475e7b23575d.tar.gz scummvm-rg350-7184fa3bade28876787422e280f5475e7b23575d.tar.bz2 scummvm-rg350-7184fa3bade28876787422e280f5475e7b23575d.zip | |
SCI: renamed kernelFind() to kernelFindColor, so that it isnt that confusing :P
svn-id: r47753
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/palette.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index d2c485961b..85eac2157d 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -328,7 +328,7 @@ void GfxPalette::kernelSetIntensity(uint16 fromColor, uint16 toColor, uint16 int 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; } diff --git a/engines/sci/graphics/palette.h b/engines/sci/graphics/palette.h index a7dfe2e837..d9cdbff5e0 100644 --- a/engines/sci/graphics/palette.h +++ b/engines/sci/graphics/palette.h @@ -51,7 +51,7 @@ public: 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(); |