From 59a255226f95d395cb73119ae2e04a3494d404a5 Mon Sep 17 00:00:00 2001
From: Martin Kiewitz
Date: Sat, 15 May 2010 08:57:13 +0000
Subject: SCI: SCI_SCREEN_MASK_* now GFX_SCREEN_MASK_*, using enum - added new
 enum GFX_SCREEN_UPSCALED_*

svn-id: r49039
---
 engines/sci/graphics/screen.h | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'engines/sci/graphics/screen.h')

diff --git a/engines/sci/graphics/screen.h b/engines/sci/graphics/screen.h
index 3316b53c69..f73b23a55d 100644
--- a/engines/sci/graphics/screen.h
+++ b/engines/sci/graphics/screen.h
@@ -35,11 +35,19 @@ namespace Sci {
 
 #define SCI_SCREEN_MAXHEIGHT 400
 
-#define SCI_SCREEN_MASK_VISUAL   1
-#define SCI_SCREEN_MASK_PRIORITY 2
-#define SCI_SCREEN_MASK_CONTROL  4
-#define SCI_SCREEN_MASK_DISPLAY  8 // not official sierra sci
-#define SCI_SCREEN_MASK_ALL      SCI_SCREEN_MASK_VISUAL|SCI_SCREEN_MASK_PRIORITY|SCI_SCREEN_MASK_CONTROL
+enum GfxScreenUpscaledMode {
+	GFX_SCREEN_UPSCALED_DISABLED	= 0,
+	GFX_SCREEN_UPSCALED_640x400		= 1,
+	GFX_SCREEN_UPSCALED_640x480		= 2
+};
+
+enum GfxScreenMasks {
+	GFX_SCREEN_MASK_VISUAL		= 1,
+	GFX_SCREEN_MASK_PRIORITY	= 2,
+	GFX_SCREEN_MASK_CONTROL		= 4,
+	GFX_SCREEN_MASK_DISPLAY		= 8, // not official sierra sci, only used internally
+	GFX_SCREEN_MASK_ALL			= GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY|GFX_SCREEN_MASK_CONTROL
+};
 
 #define SCI_SCREEN_UNDITHERMEMORIAL_SIZE 256
 
-- 
cgit v1.2.3