thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add error if user attempt to play HE games using 16bit color, when 16bit support is disabled.

Browse source 
svn-id: r41544
This commit is contained in:
Travis Howell 2009-06-15 13:23:26 +00:00
parent 0ca17a7f8c
commit e74ba9af6b
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/scumm/scumm.cpp
View file

@ -1083,12 +1083,14 @@ Common::Error ScummEngine::init() {
// CJK FT and DIG use usual NUT fonts, not FM-TOWNS ROM, so // 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 // there is no text surface for them. This takes that into account
(_screenWidth * _textSurfaceMultiplier > 320)); (_screenWidth * _textSurfaceMultiplier > 320));
#ifdef ENABLE_16BIT
} else if (_game.features & GF_16BIT_COLOR) { } else if (_game.features & GF_16BIT_COLOR) {
#ifdef ENABLE_16BIT
Graphics::PixelFormat format(Graphics::kFormatRGB555); Graphics::PixelFormat format(Graphics::kFormatRGB555);
initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, format); initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, format);
if (format != _system->getScreenFormat()) if (format != _system->getScreenFormat())
return Common::kUnsupportedColorMode; return Common::kUnsupportedColorMode;
#else
error("16bit color support is required for this game");
#endif #endif
} else { } else {
initGraphics(_screenWidth, _screenHeight, _screenWidth > 320); initGraphics(_screenWidth, _screenHeight, _screenWidth > 320);