diff options
| author | Matthew Hoops | 2012-06-16 01:37:40 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-06-16 01:43:32 -0400 |
| commit | 625f6cc71657e95e0361edefa333a38910c1aca5 (patch) | |
| tree | ae5ef8582ede4d62e56253467ea144db2341b353 /backends/platform/ps2/systemps2.cpp | |
| parent | f02b696573fe4281e4890d71b74671804a5ebf41 (diff) | |
| parent | 5230a0d61795e2855625a43d60dc3bc2ed83fc3d (diff) | |
| download | scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.tar.gz scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.tar.bz2 scummvm-rg350-625f6cc71657e95e0361edefa333a38910c1aca5.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/platform/ps2/systemps2.cpp')
| -rw-r--r-- | backends/platform/ps2/systemps2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index d4e993da63..668ac93a07 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -618,7 +618,7 @@ void OSystem_PS2::warpMouse(int x, int y) { _screen->setMouseXy(x, y); } -void OSystem_PS2::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { +void OSystem_PS2::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, bool dontScale, const Graphics::PixelFormat *format) { _screen->setMouseOverlay(buf, w, h, hotspot_x, hotspot_y, keycolor); } |