diff options
| author | D G Turner | 2012-11-18 21:19:17 +0000 |
|---|---|---|
| committer | D G Turner | 2012-11-18 22:34:15 +0000 |
| commit | d8a17a9d91da3d31d7d3a454e010a4fb5b2100ff (patch) | |
| tree | 563aa2cf53cb013ded75c751d04f2194882f9e55 /backends | |
| parent | 46027e5303de8cd102f06a07572dd5fbf02c44e6 (diff) | |
| download | scummvm-rg350-d8a17a9d91da3d31d7d3a454e010a4fb5b2100ff.tar.gz scummvm-rg350-d8a17a9d91da3d31d7d3a454e010a4fb5b2100ff.tar.bz2 scummvm-rg350-d8a17a9d91da3d31d7d3a454e010a4fb5b2100ff.zip | |
N64: Fix compiler warnings associated with cursor size variables.
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/n64/osys_n64.h | 4 | ||||
| -rw-r--r-- | backends/platform/n64/osys_n64_base.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h index 249f72d8fc..bc6b3cb1a5 100644 --- a/backends/platform/n64/osys_n64.h +++ b/backends/platform/n64/osys_n64.h @@ -104,9 +104,7 @@ protected: bool _cursorPaletteDisabled; bool _dirtyPalette; - // FIXME: This must be left as "int" for now, to fix the sign-comparison problem - // there is a little more work involved than an int->uint change - int _cursorWidth, _cursorHeight; + uint _cursorWidth, _cursorHeight; int _cursorKeycolor; diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index 7d6f8f0b5c..1fd52dfde3 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -100,8 +100,8 @@ OSystem_N64::OSystem_N64() { _cursor_pal = NULL; _cursor_hic = NULL; - _cursorWidth = -1; - _cursorHeight = -1; + _cursorWidth = 0; + _cursorHeight = 0; _cursorKeycolor = -1; _mouseHotspotX = _mouseHotspotY = -1; @@ -578,8 +578,8 @@ void OSystem_N64::updateScreen() { int mX = _mouseX - _mouseHotspotX; int mY = _mouseY - _mouseHotspotY; - for (int h = 0; h < _cursorHeight; h++) - for (int w = 0; w < _cursorWidth; w++) { + for (uint h = 0; h < _cursorHeight; h++) + for (uint w = 0; w < _cursorWidth; w++) { // Draw pixel if (((mY + h) >= 0) && ((mY + h) < _mouseMaxY) && ((mX + w) >= 0) && ((mX + w) < _mouseMaxX)) { uint16 cursor_pixel_hic = _cursor_hic[(h * _cursorWidth) + w]; |