diff options
| author | Paul Gilbert | 2016-03-20 19:42:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-20 19:42:08 -0400 |
| commit | 00edd712e85c7811c1b6f1119ad2abcad6999ce9 (patch) | |
| tree | 3dd78aa5a0840b4c241368aa7ab3715772f938fd | |
| parent | bf1199f3fe4631feb0a9cde091a08da9009d3643 (diff) | |
| download | scummvm-rg350-00edd712e85c7811c1b6f1119ad2abcad6999ce9.tar.gz scummvm-rg350-00edd712e85c7811c1b6f1119ad2abcad6999ce9.tar.bz2 scummvm-rg350-00edd712e85c7811c1b6f1119ad2abcad6999ce9.zip | |
SHERLOCK: Fix overloaded setPixels warning
| -rw-r--r-- | engines/sherlock/screen.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/surface.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/surface.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp index 85d47c84dc..33e12530ed 100644 --- a/engines/sherlock/screen.cpp +++ b/engines/sherlock/screen.cpp @@ -319,7 +319,7 @@ void Screen::vgaBar(const Common::Rect &r, int color) { } void Screen::setDisplayBounds(const Common::Rect &r) { - _sceneSurface.setPixels((byte *)_backBuffer1.getBasePtr(r.left, r.top), + _sceneSurface.setPixelsData((byte *)_backBuffer1.getBasePtr(r.left, r.top), r.width(), r.height(), _backBuffer1.format); _backBuffer = &_sceneSurface; diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp index 46304e1b2f..b9df33a309 100644 --- a/engines/sherlock/surface.cpp +++ b/engines/sherlock/surface.cpp @@ -33,7 +33,7 @@ Surface::Surface(int width, int height) : Graphics::ManagedSurface(width, height create(width, height); } -void Surface::setPixels(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat) { +void Surface::setPixelsData(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat) { Graphics::ManagedSurface::setPixels(pixelsPtr); this->format = pixFormat; this->w = sizeX; diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h index 648b121852..856d0edc9b 100644 --- a/engines/sherlock/surface.h +++ b/engines/sherlock/surface.h @@ -54,7 +54,7 @@ public: /** * Set the surface details */ - void setPixels(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat); + void setPixelsData(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat); /** * Draws a surface on this surface |