diff options
| author | Jody Northup | 2009-06-11 05:56:00 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-11 05:56:00 +0000 |
| commit | 6adbd0c41e79b5a21f0430e060347d4978e9ce78 (patch) | |
| tree | e8d99c06d597b74a64b7d1590885c13db2f03010 /common | |
| parent | b4c44a018b636a9805c725f9a286e58be554afc2 (diff) | |
| download | scummvm-rg350-6adbd0c41e79b5a21f0430e060347d4978e9ce78.tar.gz scummvm-rg350-6adbd0c41e79b5a21f0430e060347d4978e9ce78.tar.bz2 scummvm-rg350-6adbd0c41e79b5a21f0430e060347d4978e9ce78.zip | |
Renamed Graphics::ColorFormat to Graphics::ColorMode, streamlined enum by removing order section and temporarily removing kFormatARGB1555
Converted cursor code to make use of _screenFormat, instead of a parameter passed directly to it by the engine.
Adjusted scumm engine to account for these changes.
This should probably have been two separate commits, but the changes concern the same files...
svn-id: r41443
Diffstat (limited to 'common')
| -rw-r--r-- | common/system.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/system.h b/common/system.h index 59da28c990..82a89f4ad3 100644 --- a/common/system.h +++ b/common/system.h @@ -357,9 +357,9 @@ public: * * @param formatList A list of requested pixel formats, ordered by priority * - * @return a supported ColorFormat from the list, or kFormat8Bit if no supported format was found + * @return a supported ColorMode from the list, or kFormatCLUT8 if no supported format was found */ - virtual Graphics::ColorFormat findCompatibleFormat(Common::List<Graphics::ColorFormat> formatList) = 0; + virtual Graphics::ColorMode findCompatibleFormat(Common::List<Graphics::ColorMode> formatList) = 0; /** * Set the color format of the virtual screen. Typical formats include: @@ -374,7 +374,7 @@ public: * * @param format A pixel format that the backend screen will use */ - virtual void initFormat(Graphics::ColorFormat format) = 0; + virtual void initFormat(Graphics::ColorMode format) = 0; /** * Returns the pixel format description of the screen. @@ -386,7 +386,7 @@ public: * Returns the pixel format description of the requested color mode * @see Graphics::PixelFormat */ - virtual Graphics::PixelFormat getPixelFormat(Graphics::ColorFormat format) = 0; + virtual Graphics::PixelFormat getPixelFormat(Graphics::ColorMode format) = 0; #endif @@ -738,7 +738,7 @@ public: * @param cursorTargetScale scale factor which cursor is designed for */ #ifdef ENABLE_16BIT - virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int cursorTargetScale = 1, uint8 bitDepth = 8) = 0; + virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor = 0xFFFFFFFF, int cursorTargetScale = 1) = 0; #else virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int cursorTargetScale = 1) = 0; #endif |