thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SHERLOCK: Fix warnings

Browse source
This commit is contained in:
Eugene Sandulenko 2016-05-28 17:20:50 +02:00
parent 31913eee17
commit 35186ae5b0
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sherlock/scalpel/scalpel_inventory.cpp
View file

@ -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;

8
engines/sherlock/surface.h
View file

@ -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