aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-31 16:26:15 +0000
committerMartin Kiewitz2010-01-31 16:26:15 +0000
commit7184fa3bade28876787422e280f5475e7b23575d (patch)
tree799dfb8ad9b37fe8113e83900ed5ba4c6e304237
parent72c2d360f748d5c9934db2edf3c672bac7b1e165 (diff)
downloadscummvm-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
-rw-r--r--engines/sci/engine/kgraphics.cpp2
-rw-r--r--engines/sci/engine/kpathing.cpp12
-rw-r--r--engines/sci/graphics/palette.cpp2
-rw-r--r--engines/sci/graphics/palette.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 0cf34c3cab..572429a016 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -668,7 +668,7 @@ reg_t kPalette(EngineState *s, int argc, reg_t *argv) {
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;
diff --git a/engines/sci/engine/kpathing.cpp b/engines/sci/engine/kpathing.cpp
index 301daeb240..a53450b237 100644
--- a/engines/sci/engine/kpathing.cpp
+++ b/engines/sci/engine/kpathing.cpp
@@ -293,10 +293,10 @@ static void draw_line(EngineState *s, Common::Point p1, Common::Point p2, int ty
// 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 @@ static void draw_point(EngineState *s, Common::Point p, int start, int width, in
// 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);
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();