aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/screen.h
diff options
context:
space:
mode:
authorMartin Kiewitz2010-05-15 08:57:13 +0000
committerMartin Kiewitz2010-05-15 08:57:13 +0000
commit59a255226f95d395cb73119ae2e04a3494d404a5 (patch)
tree77d5beec3ab725b41c8398c133ca93215085a743 /engines/sci/graphics/screen.h
parent83a25d2e37ad1cc0870e195bc468a67dba4c353a (diff)
downloadscummvm-rg350-59a255226f95d395cb73119ae2e04a3494d404a5.tar.gz
scummvm-rg350-59a255226f95d395cb73119ae2e04a3494d404a5.tar.bz2
scummvm-rg350-59a255226f95d395cb73119ae2e04a3494d404a5.zip
SCI: SCI_SCREEN_MASK_* now GFX_SCREEN_MASK_*, using enum - added new enum GFX_SCREEN_UPSCALED_*
svn-id: r49039
Diffstat (limited to 'engines/sci/graphics/screen.h')
-rw-r--r--engines/sci/graphics/screen.h18
1 files changed, 13 insertions, 5 deletions
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