diff options
| author | Jody Northup | 2009-06-19 09:28:55 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-06-19 09:28:55 +0000 |
| commit | 704386d3b09b68f96b6d4160a1a261e3e754f461 (patch) | |
| tree | 7067ae6b04495b6aa6a2d437c061a057bd1881e6 /engines | |
| parent | 6f2b46964bd3bee3ee12f2c3cd19b62bbb8aa9b6 (diff) | |
| download | scummvm-rg350-704386d3b09b68f96b6d4160a1a261e3e754f461.tar.gz scummvm-rg350-704386d3b09b68f96b6d4160a1a261e3e754f461.tar.bz2 scummvm-rg350-704386d3b09b68f96b6d4160a1a261e3e754f461.zip | |
Removed replaced Graphics::ColorMode enum type with factory methods for Graphics::PixelFormat.
svn-id: r41662
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/engine.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp index 77ce7c44ad..fdf0186a89 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -126,8 +126,7 @@ void initCommonGFX(bool defaultTo1XScaler) { } void initGraphics(int width, int height, bool defaultTo1xScaler) { #ifdef ENABLE_16BIT - Graphics::PixelFormat format(Graphics::kFormatCLUT8); - initGraphics(width,height,defaultTo1xScaler, format); + initGraphics(width,height,defaultTo1xScaler, Graphics::PixelFormat::createFormatCLUT8()); } void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::PixelFormat format) { #endif diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 98da55d428..75a03aae0f 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1085,7 +1085,7 @@ Common::Error ScummEngine::init() { (_screenWidth * _textSurfaceMultiplier > 320)); } else if (_game.features & GF_16BIT_COLOR) { #ifdef ENABLE_16BIT - Graphics::PixelFormat format(Graphics::kFormatRGB555); + Graphics::PixelFormat format = Graphics::PixelFormat::createFormatRGB555(); initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, format); if (format != _system->getScreenFormat()) return Common::kUnsupportedColorMode; |