From e74ba9af6b95c70cdcdbcf700e0964bf0be0fca1 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 15 Jun 2009 13:23:26 +0000
Subject: Add error if user attempt to play HE games using 16bit color, when
 16bit support is disabled.

svn-id: r41544
---
 engines/scumm/scumm.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'engines/scumm')

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);
-- 
cgit v1.2.3