diff options
| author | Norbert Lange | 2009-08-24 17:51:47 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-24 17:51:47 +0000 |
| commit | 917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5 (patch) | |
| tree | e652563203a00f8acecfaafbf93c64dbfbd13f25 /backends/platform/wii/osystem.h | |
| parent | 5f87d5090cfcb34cda3c1f5d430e0865344d7366 (diff) | |
| parent | dd7868acc2512c9761d892e67a4837f4dc38bdc0 (diff) | |
| download | scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.gz scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.bz2 scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.zip | |
Merge with trunk
svn-id: r43701
Diffstat (limited to 'backends/platform/wii/osystem.h')
| -rw-r--r-- | backends/platform/wii/osystem.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/backends/platform/wii/osystem.h b/backends/platform/wii/osystem.h index e4176e8415..72263af5a8 100644 --- a/backends/platform/wii/osystem.h +++ b/backends/platform/wii/osystem.h @@ -75,6 +75,11 @@ private: u16 _currentWidth, _currentHeight; s32 _activeGraphicsMode; +#ifdef USE_RGB_COLOR + const Graphics::PixelFormat _texturePF; + Graphics::PixelFormat _screenPF; + Graphics::PixelFormat _cursorPF; +#endif bool _fullscreen; @@ -82,7 +87,7 @@ private: s32 _mouseX, _mouseY; u32 _mouseWidth, _mouseHeight; s32 _mouseHotspotX, _mouseHotspotY; - u8 _mouseKeyColor; + u16 _mouseKeyColor; u8 *_mouseCursor; bool _kbd_active; @@ -119,8 +124,13 @@ public: virtual const GraphicsMode *getSupportedGraphicsModes() const; virtual int getDefaultGraphicsMode() const; virtual bool setGraphicsMode(int mode); +#ifdef USE_RGB_COLOR + virtual Graphics::PixelFormat getScreenFormat() const; + virtual Common::List<Graphics::PixelFormat> getSupportedFormats(); +#endif virtual int getGraphicsMode() const; - virtual void initSize(uint width, uint height); + virtual void initSize(uint width, uint height, + const Graphics::PixelFormat *format); virtual int16 getWidth(); virtual int16 getHeight(); virtual void setPalette(const byte *colors, uint start, uint num); @@ -142,14 +152,15 @@ public: int x, int y, int w, int h); virtual int16 getOverlayWidth(); virtual int16 getOverlayHeight(); - virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<565>(); } + virtual Graphics::PixelFormat getOverlayFormat() const; 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, byte keycolor = 255, - int cursorTargetScale = 1); + int hotspotY, uint32 keycolor, + int cursorTargetScale, + const Graphics::PixelFormat *format); virtual bool pollEvent(Common::Event &event); virtual uint32 getMillis(); |