diff options
| author | Johannes Schickel | 2012-02-23 02:26:54 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2012-02-23 02:26:54 +0100 |
| commit | e00fc73eb891b7f460e2377fed7f12224a9103cf (patch) | |
| tree | 1bbe4d99557f0405cd59ad52a49ff95abe96bac0 | |
| parent | 99ffbfedbcee50d46c49fdd2f78a409a51c91e3b (diff) | |
| download | scummvm-rg350-e00fc73eb891b7f460e2377fed7f12224a9103cf.tar.gz scummvm-rg350-e00fc73eb891b7f460e2377fed7f12224a9103cf.tar.bz2 scummvm-rg350-e00fc73eb891b7f460e2377fed7f12224a9103cf.zip | |
IPHONE: Silence a few signed/unsigned integer comparison warnings.
| -rw-r--r-- | backends/platform/iphone/iphone_common.h | 8 | ||||
| -rw-r--r-- | backends/platform/iphone/osys_video.mm | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/backends/platform/iphone/iphone_common.h b/backends/platform/iphone/iphone_common.h index 2696888f87..93637a3bb5 100644 --- a/backends/platform/iphone/iphone_common.h +++ b/backends/platform/iphone/iphone_common.h @@ -57,16 +57,16 @@ enum GraphicsModes { struct VideoContext { // Game screen state - int screenWidth, screenHeight; + uint screenWidth, screenHeight; // Overlay state bool overlayVisible; - int overlayWidth, overlayHeight; + uint overlayWidth, overlayHeight; // Mouse cursor state - int mouseX, mouseY; + uint mouseX, mouseY; int mouseHotspotX, mouseHotspotY; - int mouseWidth, mouseHeight; + uint mouseWidth, mouseHeight; bool mouseIsVisible; // Misc state diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm index bfa96c33e4..574fc07d0d 100644 --- a/backends/platform/iphone/osys_video.mm +++ b/backends/platform/iphone/osys_video.mm @@ -137,11 +137,11 @@ void OSystem_IPHONE::copyRectToScreen(const byte *buf, int pitch, int x, int y, y = 0; } - if (w > _videoContext.screenWidth - x) { + if (w > (int)_videoContext.screenWidth - x) { w = _videoContext.screenWidth - x; } - if (h > _videoContext.screenHeight - y) { + if (h > (int)_videoContext.screenHeight - y) { h = _videoContext.screenHeight - y; } @@ -154,7 +154,7 @@ void OSystem_IPHONE::copyRectToScreen(const byte *buf, int pitch, int x, int y, byte *dst = _gameScreenRaw + y * _videoContext.screenWidth + x; - if (_videoContext.screenWidth == pitch && pitch == w) + if ((int)_videoContext.screenWidth == pitch && pitch == w) memcpy(dst, buf, h * w); else { do { @@ -300,10 +300,10 @@ void OSystem_IPHONE::copyRectToOverlay(const OverlayColor *buf, int pitch, int x y = 0; } - if (w > _videoContext.overlayWidth - x) + if (w > (int)_videoContext.overlayWidth - x) w = _videoContext.overlayWidth - x; - if (h > _videoContext.overlayHeight - y) + if (h > (int)_videoContext.overlayHeight - y) h = _videoContext.overlayHeight - y; if (w <= 0 || h <= 0) @@ -314,7 +314,7 @@ void OSystem_IPHONE::copyRectToOverlay(const OverlayColor *buf, int pitch, int x } OverlayColor *dst = _overlayBuffer + (y * _videoContext.overlayWidth + x); - if (_videoContext.overlayWidth == pitch && pitch == w) + if ((int)_videoContext.overlayWidth == pitch && pitch == w) memcpy(dst, buf, h * w * sizeof(OverlayColor)); else { do { |