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

[upthorn at users.sourceforge.net]

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

Log Message:
-----------
Removed #ifdef blocks around new error values in Common::Error and OSystem::TransactionError.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/common/error.h
    scummvm/branches/gsoc2009-16bit/common/system.h

Modified: scummvm/branches/gsoc2009-16bit/common/error.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/common/error.h	2009-07-09 03:12:11 UTC (rev 42279)
+++ scummvm/branches/gsoc2009-16bit/common/error.h	2009-07-09 09:06:31 UTC (rev 42280)
@@ -48,9 +48,7 @@
 	kInvalidPathError,			//!< Engine initialization: Invalid game path was passed
 	kNoGameDataFoundError,		//!< Engine initialization: No game data was found in the specified location
 	kUnsupportedGameidError,	//!< Engine initialization: Gameid not supported by this (Meta)Engine
-#ifdef ENABLE_RGB_COLOR
 	kUnsupportedColorMode,		//!< Engine initialization: Engine does not support backend's color mode
-#endif
 
 
 	kReadPermissionDenied,		//!< Unable to read data due to missing read permission

Modified: scummvm/branches/gsoc2009-16bit/common/system.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/common/system.h	2009-07-09 03:12:11 UTC (rev 42279)
+++ scummvm/branches/gsoc2009-16bit/common/system.h	2009-07-09 09:06:31 UTC (rev 42280)
@@ -472,10 +472,8 @@
 		kTransactionAspectRatioFailed = (1 << 0),	/**< Failed switchting aspect ratio correction mode */
 		kTransactionFullscreenFailed = (1 << 1),	/**< Failed switchting fullscreen mode */
 		kTransactionModeSwitchFailed = (1 << 2),	/**< Failed switchting the GFX graphics mode (setGraphicsMode) */
-#ifdef ENABLE_RGB_COLOR
-		kTransactionFormatNotSupported = (1 << 4), /**< Failed setting the color format (function not yet implemented) */
-#endif
-		kTransactionSizeChangeFailed = (1 << 3)		/**< Failed switchting the screen dimensions (initSize) */
+		kTransactionSizeChangeFailed = (1 << 3),	/**< Failed switchting the screen dimensions (initSize) */
+		kTransactionFormatNotSupported = (1 << 4)	/**< Failed setting the color format */
 	};
 
 	/**


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