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/n64 | |
| 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/n64')
| -rw-r--r-- | backends/platform/n64/osys_n64.h | 2 | ||||
| -rw-r--r-- | backends/platform/n64/osys_n64_base.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h index 4788beb1ca..b8519eeea6 100644 --- a/backends/platform/n64/osys_n64.h +++ b/backends/platform/n64/osys_n64.h @@ -182,7 +182,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, int cursorTargetScale, const Graphics::PixelFormat *format); + virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format); virtual void setCursorPalette(const byte *colors, uint start, uint num); virtual bool pollEvent(Common::Event &event); diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index c3adb9691c..f36f7399e1 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -773,7 +773,7 @@ void OSystem_N64::warpMouse(int x, int y) { _dirtyOffscreen = true; } -void OSystem_N64::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { +void OSystem_N64::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { if (!w || !h) return; _mouseHotspotX = hotspotX; |