Skip to content

Commit

Permalink
Merge branch 'master' of github.com:scummvm/scummvm
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Kiewitz authored and wjp committed Jun 10, 2015
2 parents 256158c + ce6ad7e commit 1c44fa5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions engines/sherlock/scalpel/scalpel.cpp
Expand Up @@ -187,11 +187,11 @@ ScalpelEngine::~ScalpelEngine() {

void ScalpelEngine::initialize() {
// 3DO actually uses RGB555, but some platforms of ours only support RGB565, so we use that
const Graphics::PixelFormat *pixelFormatRGB565 = new Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);

if (getPlatform() == Common::kPlatform3DO) {
const Graphics::PixelFormat pixelFormatRGB565 = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
// 320x200 16-bit RGB565 for 3DO support
initGraphics(320, 200, false, pixelFormatRGB565);
initGraphics(320, 200, false, &pixelFormatRGB565);
} else {
// 320x200 palettized
initGraphics(320, 200, false);
Expand Down

0 comments on commit 1c44fa5

Please sign in to comment.