aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2016-05-28 17:20:50 +0200
committerEugene Sandulenko2016-05-28 17:20:50 +0200
commit35186ae5b008830d057fb15fc0195e22cce23fbd (patch)
treee8de10b6286b54452b8aa04bd8cd5325d7d94c05 /engines
parent31913eee17dea5a5baad1d4927dd723e22afd097 (diff)
downloadscummvm-rg350-35186ae5b008830d057fb15fc0195e22cce23fbd.tar.gz
scummvm-rg350-35186ae5b008830d057fb15fc0195e22cce23fbd.tar.bz2
scummvm-rg350-35186ae5b008830d057fb15fc0195e22cce23fbd.zip
SHERLOCK: Fix warnings
Diffstat (limited to 'engines')
-rw-r--r--engines/sherlock/scalpel/scalpel_inventory.cpp2
-rw-r--r--engines/sherlock/surface.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sherlock/scalpel/scalpel_inventory.cpp b/engines/sherlock/scalpel/scalpel_inventory.cpp
index 6eb8c2c05c..07659b41f2 100644
--- a/engines/sherlock/scalpel/scalpel_inventory.cpp
+++ b/engines/sherlock/scalpel/scalpel_inventory.cpp
@@ -109,7 +109,7 @@ void ScalpelInventory::drawInventory(InvNewMode mode) {
_invMode = (InvMode)((int)mode);
if (mode != PLAIN_INVENTORY) {
- assert(mode < sizeof(_hotkeysIndexed));
+ assert((uint)mode < sizeof(_hotkeysIndexed));
ui._oldKey = _hotkeysIndexed[mode];
} else {
ui._oldKey = -1;
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 7e02d4cddc..807fbeb1d1 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -45,7 +45,7 @@ public:
* Constructor
*/
BaseSurface();
-
+
/**
* Constructor
*/
@@ -95,7 +95,7 @@ public:
* Return the width of the surface
*/
virtual uint16 width() const { return this->w; }
-
+
/**
* Return the height of the surface
*/
@@ -105,7 +105,7 @@ public:
* Draws the given string into the back buffer using the images stored in _font
*/
void writeString(const Common::String &str, const Common::Point &pt, uint overrideColor);
-
+
/**
* Draws a fancy version of the given string at the given position
*/
@@ -121,7 +121,7 @@ protected:
virtual void addDirtyRect(const Common::Rect &r) {}
public:
Surface() : BaseSurface() {}
- Surface(int width, int height) : BaseSurface(width, height) {}
+ Surface(int w, int h) : BaseSurface(w, h) {}
};
} // End of namespace Sherlock