diff options
| author | Johannes Schickel | 2013-04-19 06:43:47 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2013-04-19 06:43:47 -0700 |
| commit | 2785c3a5287019ad2eb9eddb4aae374128d243a4 (patch) | |
| tree | b95a053d2b4b3d67c772a5c51a356994c317b0f7 /engines/wintermute | |
| parent | 80271c24b122f737aca6a617b7096260315e110d (diff) | |
| parent | 34aaac0a1e40ce2136572ffc71de3345ace706ef (diff) | |
| download | scummvm-rg350-2785c3a5287019ad2eb9eddb4aae374128d243a4.tar.gz scummvm-rg350-2785c3a5287019ad2eb9eddb4aae374128d243a4.tar.bz2 scummvm-rg350-2785c3a5287019ad2eb9eddb4aae374128d243a4.zip | |
Merge pull request #322 from fingolfin/fix-clang-warnings
Fix clang warnings
Diffstat (limited to 'engines/wintermute')
| -rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/save_thumb_helper.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index 5139620727..351444a1db 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -478,7 +478,7 @@ bool BaseFontBitmap::loadBuffer(byte *buffer) { _widths[spaceChar] = spaceWidth; } else { if (_widths[spaceChar] == expandWidth || _widths[spaceChar] == 0) { - _widths[spaceChar] = (_widths['m'] + _widths['i']) / 2; + _widths[spaceChar] = (_widths[(uint)'m'] + _widths[(uint)'i']) / 2; } } } else { diff --git a/engines/wintermute/base/save_thumb_helper.h b/engines/wintermute/base/save_thumb_helper.h index 43cc7e39a7..0efae26a4a 100644 --- a/engines/wintermute/base/save_thumb_helper.h +++ b/engines/wintermute/base/save_thumb_helper.h @@ -44,7 +44,6 @@ public: BaseImage *_scummVMThumb; private: BaseImage *storeThumb(bool doFlip, int width, int height); - BaseImage *_richThumbnail; BaseGame *_gameRef; }; |