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 /engines/scumm/scumm.cpp | |
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 'engines/scumm/scumm.cpp')
-rw-r--r-- | engines/scumm/scumm.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 3d0a2d0bc2..0ebf832a37 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1083,12 +1083,14 @@ Common::Error ScummEngine::init() { // CJK FT and DIG use usual NUT fonts, not FM-TOWNS ROM, so // there is no text surface for them. This takes that into account (_screenWidth * _textSurfaceMultiplier > 320)); +#ifdef ENABLE_16BIT } else if (_game.features & GF_16BIT_COLOR) { - int format = Graphics::kFormatRGB555 | Graphics::kFormatRGB; - Common::List<Graphics::ColorFormat> formatList; - formatList.push_back((Graphics::ColorFormat) format); - formatList.push_back(Graphics::kFormat8Bit); + int format = Graphics::kFormatRGB555; + Common::List<Graphics::ColorMode> formatList; + formatList.push_back((Graphics::ColorMode) format); + formatList.push_back(Graphics::kFormatCLUT8); initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, formatList); +#endif } else { initGraphics(_screenWidth, _screenHeight, _screenWidth > 320); } |