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/ds/arm9/source/osystem_ds.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/ds/arm9/source/osystem_ds.cpp')
-rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 73340ed18a..a6b85f207f 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -580,7 +580,7 @@ bool OSystem_DS::showMouse(bool visible) { void OSystem_DS::warpMouse(int x, int y) { } -void OSystem_DS::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, u32 keycolor, int targetCursorScale, const Graphics::PixelFormat *format) { +void OSystem_DS::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, u32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { if ((w > 0) && (w < 64) && (h > 0) && (h < 64)) { memcpy(_cursorImage, buf, w * h); _cursorW = w; @@ -588,7 +588,9 @@ void OSystem_DS::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, i _cursorHotX = hotspotX; _cursorHotY = hotspotY; _cursorKey = keycolor; - _cursorScale = targetCursorScale; + // TODO: The old target scales was saved, but never used. Should the + // new "do not scale" logic be implemented? + //_cursorScale = targetCursorScale; refreshCursor(); } } |