aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/surface.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2016-08-01 11:55:48 +0300
committerEugene Sandulenko2016-08-01 11:55:48 +0300
commit6412e40b387ca9f15bad017161f2502a9ebee81f (patch)
treed57a08b05e5a3922f090d024d20159b3f5fb5219 /engines/sherlock/surface.cpp
parent2b0297755de045a62af1c59e5df24a144de205ea (diff)
downloadscummvm-rg350-6412e40b387ca9f15bad017161f2502a9ebee81f.tar.gz
scummvm-rg350-6412e40b387ca9f15bad017161f2502a9ebee81f.tar.bz2
scummvm-rg350-6412e40b387ca9f15bad017161f2502a9ebee81f.zip
SHERLOCK: Fix another warning
Diffstat (limited to 'engines/sherlock/surface.cpp')
-rw-r--r--engines/sherlock/surface.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 93bc001149..cca012630c 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -29,9 +29,9 @@ BaseSurface::BaseSurface() : Graphics::Screen(0, 0), Fonts() {
free(); // Free the 0x0 surface allocated by Graphics::Screen
}
-BaseSurface::BaseSurface(int width, int height) : Graphics::Screen(width, height),
+BaseSurface::BaseSurface(int width_, int height_) : Graphics::Screen(width_, height_),
Fonts() {
- create(width, height);
+ create(width_, height_);
}
void BaseSurface::writeString(const Common::String &str, const Common::Point &pt, uint overrideColor) {
@@ -61,7 +61,7 @@ void BaseSurface::SHtransBlitFrom(const Graphics::Surface &src, const Common::Po
Common::Rect srcRect(0, 0, src.w, src.h);
Common::Rect destRect(pt.x, pt.y, pt.x + src.w * SCALE_THRESHOLD / scaleVal,
pt.y + src.h * SCALE_THRESHOLD / scaleVal);
-
+
Graphics::Screen::transBlitFrom(src, srcRect, destRect, TRANSPARENCY,
flipped, overrideColor);
}