diff options
| author | Jody Northup | 2009-07-09 09:06:31 +0000 |
|---|---|---|
| committer | Jody Northup | 2009-07-09 09:06:31 +0000 |
| commit | 1d38ead4e78fafa0d2f97dccf889ea392059eb0f (patch) | |
| tree | 8db4e383e8059c82f25c7566e52e98781dfd6c2a /common | |
| parent | bffeaaae76ebe5b5e981f5157e9b806f48c29a4f (diff) | |
| download | scummvm-rg350-1d38ead4e78fafa0d2f97dccf889ea392059eb0f.tar.gz scummvm-rg350-1d38ead4e78fafa0d2f97dccf889ea392059eb0f.tar.bz2 scummvm-rg350-1d38ead4e78fafa0d2f97dccf889ea392059eb0f.zip | |
Removed #ifdef blocks around new error values in Common::Error and OSystem::TransactionError.
svn-id: r42280
Diffstat (limited to 'common')
| -rw-r--r-- | common/error.h | 2 | ||||
| -rw-r--r-- | common/system.h | 6 |
2 files changed, 2 insertions, 6 deletions
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 diff --git a/common/system.h b/common/system.h index 6bcf746292..097348be19 100644 --- a/common/system.h +++ b/common/system.h @@ -472,10 +472,8 @@ public: 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 */ }; /** |