[Scummvm-cvs-logs] SF.net SVN: scummvm:[41544] scummvm/branches/gsoc2009-16bit/engines/scumm/ scumm.cpp

[Kirben at users.sourceforge.net]

Revision: 41544
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41544&view=rev
Author:   Kirben
Date:     2009-06-15 13:23:26 +0000 (Mon, 15 Jun 2009)

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

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp	2009-06-15 11:46:28 UTC (rev 41543)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp	2009-06-15 13:23:26 UTC (rev 41544)
@@ -1083,12 +1083,14 @@
 					// 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));
+	} else if (_game.features & GF_16BIT_COLOR) {
 #ifdef ENABLE_16BIT
-	} else if (_game.features & GF_16BIT_COLOR) {
 		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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.