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/android/gfx.cpp | |
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/android/gfx.cpp')
-rw-r--r-- | backends/platform/android/gfx.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp index 8bc914f567..304031b4ba 100644 --- a/backends/platform/android/gfx.cpp +++ b/backends/platform/android/gfx.cpp @@ -687,10 +687,10 @@ bool OSystem_Android::showMouse(bool visible) { void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, - uint32 keycolor, int cursorTargetScale, + uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { ENTER("%p, %u, %u, %d, %d, %u, %d, %p", buf, w, h, hotspotX, hotspotY, - keycolor, cursorTargetScale, format); + keycolor, dontScale, format); GLTHREADCHECK; @@ -766,7 +766,8 @@ void OSystem_Android::setMouseCursor(const byte *buf, uint w, uint h, } _mouse_hotspot = Common::Point(hotspotX, hotspotY); - _mouse_targetscale = cursorTargetScale; + // TODO: Adapt to the new "do not scale" cursor logic. + _mouse_targetscale = 1; } void OSystem_Android::setCursorPaletteInternal(const byte *colors, |