diff options
author | Jody Northup | 2009-07-09 09:09:05 +0000 |
---|---|---|
committer | Jody Northup | 2009-07-09 09:09:05 +0000 |
commit | cdad3763dfbacf45599034358a32fc68032e1a30 (patch) | |
tree | f84a129ee1acf8aaaa88443e81807f32351c7208 | |
parent | 1d38ead4e78fafa0d2f97dccf889ea392059eb0f (diff) | |
download | scummvm-rg350-cdad3763dfbacf45599034358a32fc68032e1a30.tar.gz scummvm-rg350-cdad3763dfbacf45599034358a32fc68032e1a30.tar.bz2 scummvm-rg350-cdad3763dfbacf45599034358a32fc68032e1a30.zip |
Corrected lingering formatting errors that were introduced by the find-and-replace assisted removal of Graphics::PixelFormat::createFormat functions.
svn-id: r42281
-rw-r--r-- | common/system.h | 3 | ||||
-rw-r--r-- | engines/scumm/scumm.cpp | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/common/system.h b/common/system.h index 097348be19..c13887e0a9 100644 --- a/common/system.h +++ b/common/system.h @@ -369,12 +369,9 @@ public: * EG: a backend that supports 32-bit ABGR and 16-bit 555 BGR in hardware * and provides conversion from equivalent RGB(A) modes should order its list * 1) Graphics::PixelFormat(4, 0, 0, 0, 0, 0, 8, 16, 24) - * 2) Graphics::PixelFormat(2, 3, 3, 3, 8, 0, 5, 10, 0) - * 3) Graphics::PixelFormat(4, 0, 0, 0, 0, 24, 16, 8, 0) * 4) Graphics::PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0) - * 5) Graphics::PixelFormat::createFormatCLUT8() * * @see Graphics::PixelFormat diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 347abee190..57283c1fbe 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1085,8 +1085,7 @@ Common::Error ScummEngine::init() { (_screenWidth * _textSurfaceMultiplier > 320)); } else if (_game.features & GF_16BIT_COLOR) { #ifdef ENABLE_RGB_COLOR - Graphics::PixelFormat format = Graphics::PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0) -; + Graphics::PixelFormat format = Graphics::PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0); initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, &format); if (format != _system->getScreenFormat()) return Common::kUnsupportedColorMode; |