[Scummvm-cvs-logs] SF.net SVN: scummvm:[42281] scummvm/branches/gsoc2009-16bit

upthorn at users.sourceforge.net upthorn at users.sourceforge.net
Thu Jul 9 11:09:05 CEST 2009


Revision: 42281
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42281&view=rev
Author:   upthorn
Date:     2009-07-09 09:09:05 +0000 (Thu, 09 Jul 2009)

Log Message:
-----------
Corrected lingering formatting errors that were introduced by the find-and-replace assisted removal of Graphics::PixelFormat::createFormat functions.

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

Modified: scummvm/branches/gsoc2009-16bit/common/system.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/common/system.h	2009-07-09 09:06:31 UTC (rev 42280)
+++ scummvm/branches/gsoc2009-16bit/common/system.h	2009-07-09 09:09:05 UTC (rev 42281)
@@ -369,12 +369,9 @@
 	 * EG: a backend that supports 32-bit ABGR and 16-bit 555 BGR in hardware
 	 * and provides conversion from equivalent RGB(A) modes should order its list
 	 *    1) Graphics::PixelFormat(4, 0, 0, 0, 0, 0, 8, 16, 24)
-
 	 *    2) Graphics::PixelFormat(2, 3, 3, 3, 8, 0, 5, 10, 0)
-
 	 *    3) Graphics::PixelFormat(4, 0, 0, 0, 0, 24, 16, 8, 0)
 	 *    4) Graphics::PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0)
-
 	 *    5) Graphics::PixelFormat::createFormatCLUT8()
 	 *
 	 * @see Graphics::PixelFormat

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp	2009-07-09 09:06:31 UTC (rev 42280)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp	2009-07-09 09:09:05 UTC (rev 42281)
@@ -1085,8 +1085,7 @@
 					(_screenWidth * _textSurfaceMultiplier > 320));
 	} else if (_game.features & GF_16BIT_COLOR) {
 #ifdef ENABLE_RGB_COLOR
-		Graphics::PixelFormat format = Graphics::PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0)
-;
+		Graphics::PixelFormat format = Graphics::PixelFormat(2, 3, 3, 3, 8, 10, 5, 0, 0);
 		initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, &format);
 		if (format != _system->getScreenFormat())
 			return Common::kUnsupportedColorMode;


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




More information about the Scummvm-git-logs mailing list