diff options
| author | Eugene Sandulenko | 2012-06-08 23:20:28 -0700 |
|---|---|---|
| committer | Eugene Sandulenko | 2012-06-08 23:20:28 -0700 |
| commit | ec92a867da699f069a6adee41be89a50be0b9128 (patch) | |
| tree | 6b14d8649afa0afb08f1bef2118328e8cc6e91e0 /backends/platform/iphone | |
| parent | 3968f3194893d88d1a8d73eef535b801e5415765 (diff) | |
| parent | a401f0a19e09d7d00a3ee94d928db82e658b7b48 (diff) | |
| download | scummvm-rg350-ec92a867da699f069a6adee41be89a50be0b9128.tar.gz scummvm-rg350-ec92a867da699f069a6adee41be89a50be0b9128.tar.bz2 scummvm-rg350-ec92a867da699f069a6adee41be89a50be0b9128.zip | |
Merge pull request #243 from lordhoto/cursor-no-scale
ALL: Replace cursorTargetScale in OSystem API with a simple "do not scale" logic.
Diffstat (limited to 'backends/platform/iphone')
| -rw-r--r-- | backends/platform/iphone/osys_main.h | 2 | ||||
| -rw-r--r-- | backends/platform/iphone/osys_video.mm | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h index b443e22f56..e06c7973ab 100644 --- a/backends/platform/iphone/osys_main.h +++ b/backends/platform/iphone/osys_main.h @@ -161,7 +161,7 @@ public: virtual bool showMouse(bool visible); virtual void warpMouse(int x, int y); - virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 255, int cursorTargetScale = 1, const Graphics::PixelFormat *format = NULL); + virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 255, bool dontScale = false, const Graphics::PixelFormat *format = NULL); virtual void setCursorPalette(const byte *colors, uint start, uint num); virtual bool pollEvent(Common::Event &event); diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm index c6b6e6d757..ddfa8f5030 100644 --- a/backends/platform/iphone/osys_video.mm +++ b/backends/platform/iphone/osys_video.mm @@ -398,8 +398,8 @@ void OSystem_IPHONE::dirtyFullOverlayScreen() { } } -void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { - //printf("setMouseCursor(%p, %u, %u, %i, %i, %u, %d, %p)\n", (const void *)buf, w, h, hotspotX, hotspotY, keycolor, cursorTargetScale, (const void *)format); +void OSystem_IPHONE::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { + //printf("setMouseCursor(%p, %u, %u, %i, %i, %u, %d, %p)\n", (const void *)buf, w, h, hotspotX, hotspotY, keycolor, dontScale, (const void *)format); const Graphics::PixelFormat pixelFormat = format ? *format : Graphics::PixelFormat::createFormatCLUT8(); #if 0 |