From 8d306ebccfa7e88b2e4f4635bff3987e550f98d3 Mon Sep 17 00:00:00 2001
From: Jody Northup
Date: Mon, 15 Jun 2009 09:45:19 +0000
Subject: Added kUnsupportedColorMode error code brought Scumm engine and SDL
 backend into compliance with API outlined in
 http://scummvmupthorn09.wordpress.com/2009/06/14/how-this-is-going-to-work/
 Provided convenient Graphics::PixelFormat constructors for ColorMode enums,
 and bitformat integers. Removed last vestiges (I think) of initial cursor
 hack.

svn-id: r41539
---
 common/error.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'common/error.h')

diff --git a/common/error.h b/common/error.h
index 23305a5c2e..8959a6ae23 100644
--- a/common/error.h
+++ b/common/error.h
@@ -48,6 +48,9 @@ enum Error {
 	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_16BIT
+	kUnsupportedColorMode,		//!< Engine initialization: Engine does not support backend's color mode
+#endif
 
 
 	kReadPermissionDenied,		//!< Unable to read data due to missing read permission
-- 
cgit v1.2.3


From f7dd1c15ed38418a0371032966144eb6c2e004cb Mon Sep 17 00:00:00 2001
From: Jody Northup
Date: Sat, 20 Jun 2009 05:23:09 +0000
Subject: renamed ENABLE_16BIT define to more accurate ENABLE_RGB_COLOR

svn-id: r41696
---
 common/error.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/error.h')

diff --git a/common/error.h b/common/error.h
index 8959a6ae23..6522fbf4af 100644
--- a/common/error.h
+++ b/common/error.h
@@ -48,7 +48,7 @@ enum Error {
 	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_16BIT
+#ifdef ENABLE_RGB_COLOR
 	kUnsupportedColorMode,		//!< Engine initialization: Engine does not support backend's color mode
 #endif
 
-- 
cgit v1.2.3


From 1d38ead4e78fafa0d2f97dccf889ea392059eb0f Mon Sep 17 00:00:00 2001
From: Jody Northup
Date: Thu, 9 Jul 2009 09:06:31 +0000
Subject: Removed #ifdef blocks around new error values in Common::Error and
 OSystem::TransactionError.

svn-id: r42280
---
 common/error.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'common/error.h')

diff --git a/common/error.h b/common/error.h
index 6522fbf4af..d91ce2971a 100644
--- a/common/error.h
+++ b/common/error.h
@@ -48,9 +48,7 @@ enum Error {
 	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
-- 
cgit v1.2.3