aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2009-06-15 13:23:26 +0000
committerTravis Howell2009-06-15 13:23:26 +0000
commite74ba9af6b95c70cdcdbcf700e0964bf0be0fca1 (patch)
tree9b417b4d9dbbf2563c3f2dd9a218eb944770116e /engines/scumm
parent0ca17a7f8c79940873a4dc82537310584f03e439 (diff)
downloadscummvm-rg350-e74ba9af6b95c70cdcdbcf700e0964bf0be0fca1.tar.gz
scummvm-rg350-e74ba9af6b95c70cdcdbcf700e0964bf0be0fca1.tar.bz2
scummvm-rg350-e74ba9af6b95c70cdcdbcf700e0964bf0be0fca1.zip
Add error if user attempt to play HE games using 16bit color, when 16bit support is disabled.
svn-id: r41544
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/scumm.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 9469a15e54..98da55d428 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1083,12 +1083,14 @@ Common::Error ScummEngine::init() {
// 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
(_screenWidth * _textSurfaceMultiplier > 320));
-#ifdef ENABLE_16BIT
} else if (_game.features & GF_16BIT_COLOR) {
+#ifdef ENABLE_16BIT
Graphics::PixelFormat format(Graphics::kFormatRGB555);
initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, format);
if (format != _system->getScreenFormat())
return Common::kUnsupportedColorMode;
+#else
+ error("16bit color support is required for this game");
#endif
} else {
initGraphics(_screenWidth, _screenHeight, _screenWidth > 320);