diff options
| author | Jody Northup | 2009-06-15 09:45:19 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-15 09:45:19 +0000 |
| commit | 8d306ebccfa7e88b2e4f4635bff3987e550f98d3 (patch) | |
| tree | 937afc4b40b3d38da4a67fcd13cef91c097097cb /engines/scumm/scumm.cpp | |
| parent | e6f874ee9508a6631635504808680e50a4f55c7f (diff) | |
| download | scummvm-rg350-8d306ebccfa7e88b2e4f4635bff3987e550f98d3.tar.gz scummvm-rg350-8d306ebccfa7e88b2e4f4635bff3987e550f98d3.tar.bz2 scummvm-rg350-8d306ebccfa7e88b2e4f4635bff3987e550f98d3.zip | |
Added kUnsupportedColorMode error code brought Scumm engine and SDL backend into compliance with API outlined in http://scummvmupthorn09.wordpress.com/2009/06/14/how-this-is-going-to-work/
Provided convenient Graphics::PixelFormat constructors for ColorMode enums, and bitformat integers.
Removed last vestiges (I think) of initial cursor hack.
svn-id: r41539
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 0ebf832a37..5fec6ec835 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1085,11 +1085,10 @@ Common::Error ScummEngine::init() { (_screenWidth * _textSurfaceMultiplier > 320)); #ifdef ENABLE_16BIT } else if (_game.features & GF_16BIT_COLOR) { - 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); + Graphics::PixelFormat format = Graphics::kFormatRGB555; + initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, format); + if (format != _system->getScreenFormat()) + return Common::kUnsupportedColorMode; #endif } else { initGraphics(_screenWidth, _screenHeight, _screenWidth > 320); |