diff options
author | Filippos Karapetis | 2016-03-16 01:03:24 +0200 |
---|---|---|
committer | Filippos Karapetis | 2016-03-16 01:51:06 +0200 |
commit | 75527e3df5349fe0cdbdc2ccc06a641d64849dc1 (patch) | |
tree | 4c376ca2a4789ea46f3fc7586820334f30381da5 | |
parent | bd81da1a6a7604805c927073f086767c5baf2bac (diff) | |
download | scummvm-rg350-75527e3df5349fe0cdbdc2ccc06a641d64849dc1.tar.gz scummvm-rg350-75527e3df5349fe0cdbdc2ccc06a641d64849dc1.tar.bz2 scummvm-rg350-75527e3df5349fe0cdbdc2ccc06a641d64849dc1.zip |
SCI32: Remove getColorAtCoordinate()
The only calling code for this was removed in commit 3f2469c33ed6017d3c385fbbfd01a4e690987fbc
-rw-r--r-- | engines/sci/graphics/cache.cpp | 4 | ||||
-rw-r--r-- | engines/sci/graphics/cache.h | 2 | ||||
-rw-r--r-- | engines/sci/graphics/view.cpp | 9 | ||||
-rw-r--r-- | engines/sci/graphics/view.h | 2 |
4 files changed, 0 insertions, 17 deletions
diff --git a/engines/sci/graphics/cache.cpp b/engines/sci/graphics/cache.cpp index 59af8334eb..fb1f557ad6 100644 --- a/engines/sci/graphics/cache.cpp +++ b/engines/sci/graphics/cache.cpp @@ -102,8 +102,4 @@ int16 GfxCache::kernelViewGetCelCount(GuiResourceId viewId, int16 loopNo) { return getView(viewId)->getCelCount(loopNo); } -byte GfxCache::kernelViewGetColorAtCoordinate(GuiResourceId viewId, int16 loopNo, int16 celNo, int16 x, int16 y) { - return getView(viewId)->getColorAtCoordinate(loopNo, celNo, x, y); -} - } // End of namespace Sci diff --git a/engines/sci/graphics/cache.h b/engines/sci/graphics/cache.h index 33fa4fe399..61952718a9 100644 --- a/engines/sci/graphics/cache.h +++ b/engines/sci/graphics/cache.h @@ -49,8 +49,6 @@ public: int16 kernelViewGetLoopCount(GuiResourceId viewId); int16 kernelViewGetCelCount(GuiResourceId viewId, int16 loopNo); - byte kernelViewGetColorAtCoordinate(GuiResourceId viewId, int16 loopNo, int16 celNo, int16 x, int16 y); - private: void purgeFontCache(); void purgeViewCache(); diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp index ff3fc70619..1939e66179 100644 --- a/engines/sci/graphics/view.cpp +++ b/engines/sci/graphics/view.cpp @@ -975,13 +975,4 @@ void GfxView::adjustBackUpscaledCoordinates(int16 &y, int16 &x) { _screen->adjustBackUpscaledCoordinates(y, x, _sci2ScaleRes); } -byte GfxView::getColorAtCoordinate(int16 loopNo, int16 celNo, int16 x, int16 y) { - const CelInfo *celInfo = getCelInfo(loopNo, celNo); - const byte *bitmap = getBitmap(loopNo, celNo); - const int16 celWidth = celInfo->width; - - bitmap += (celWidth * y); - return bitmap[x]; -} - } // End of namespace Sci diff --git a/engines/sci/graphics/view.h b/engines/sci/graphics/view.h index d8803db208..91590208c1 100644 --- a/engines/sci/graphics/view.h +++ b/engines/sci/graphics/view.h @@ -85,8 +85,6 @@ public: void adjustToUpscaledCoordinates(int16 &y, int16 &x); void adjustBackUpscaledCoordinates(int16 &y, int16 &x); - byte getColorAtCoordinate(int16 loopNo, int16 celNo, int16 x, int16 y); - private: void initData(GuiResourceId resourceId); void unpackCel(int16 loopNo, int16 celNo, byte *outPtr, uint32 pixelCount); |