diff options
| author | Johannes Schickel | 2012-06-20 08:02:26 -0700 |
|---|---|---|
| committer | Johannes Schickel | 2012-06-20 08:02:26 -0700 |
| commit | 4fb9bceabc4309a477472aa55207eae55bc0aa13 (patch) | |
| tree | 1e119f6d63d0a4c5c38a7caabd92be335749f07d /backends/platform/ds/arm9/source/osystem_ds.h | |
| parent | 5a2e65469f3650dc9785bf27b77d25d285ded4f1 (diff) | |
| parent | aec9b9e22a9bff54ae3c39bb796bae0f4b4c2d95 (diff) | |
| download | scummvm-rg350-4fb9bceabc4309a477472aa55207eae55bc0aa13.tar.gz scummvm-rg350-4fb9bceabc4309a477472aa55207eae55bc0aa13.tar.bz2 scummvm-rg350-4fb9bceabc4309a477472aa55207eae55bc0aa13.zip | |
Merge pull request #246 from lordhoto/osystem-void-buffers
OSYSTEM: Use void buffers for screen/overlay/mouse buffers and proper pitch values for overlay code
Diffstat (limited to 'backends/platform/ds/arm9/source/osystem_ds.h')
| -rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h index 11b0988666..a6001da764 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -98,15 +98,15 @@ protected: public: void restoreHardwarePalette(); - virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h); + virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h); virtual void updateScreen(); virtual void setShakePos(int shakeOffset); virtual void showOverlay(); virtual void hideOverlay(); virtual void clearOverlay(); - virtual void grabOverlay(OverlayColor *buf, int pitch); - virtual void copyRectToOverlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h); + virtual void grabOverlay(void *buf, int pitch); + virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h); virtual int16 getOverlayHeight(); virtual int16 getOverlayWidth(); virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<1555>(); } @@ -114,7 +114,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, u32 keycolor, bool dontScale, const Graphics::PixelFormat *format); + virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, u32 keycolor, bool dontScale, const Graphics::PixelFormat *format); virtual bool pollEvent(Common::Event &event); virtual uint32 getMillis(); |