diff options
| author | Martin Kiewitz | 2010-05-15 08:57:13 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-05-15 08:57:13 +0000 |
| commit | 59a255226f95d395cb73119ae2e04a3494d404a5 (patch) | |
| tree | 77d5beec3ab725b41c8398c133ca93215085a743 /engines/sci/graphics/view.cpp | |
| parent | 83a25d2e37ad1cc0870e195bc468a67dba4c353a (diff) | |
| download | scummvm-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/view.cpp')
| -rw-r--r-- | engines/sci/graphics/view.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp index 4e4d183ca1..aa1ad10c75 100644 --- a/engines/sci/graphics/view.cpp +++ b/engines/sci/graphics/view.cpp @@ -507,7 +507,7 @@ void GfxView::draw(Common::Rect rect, Common::Rect clipRect, Common::Rect clipRe int16 width, height; byte clearKey = celInfo->clearKey; byte color; - byte drawMask = priority == 255 ? SCI_SCREEN_MASK_VISUAL : SCI_SCREEN_MASK_VISUAL|SCI_SCREEN_MASK_PRIORITY; + byte drawMask = priority == 255 ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY; int x, y; if (_embeddedPal) { @@ -554,7 +554,7 @@ void GfxView::drawScaled(Common::Rect rect, Common::Rect clipRect, Common::Rect int16 celHeight = celInfo->height, celWidth = celInfo->width; byte clearKey = celInfo->clearKey; byte color; - byte drawMask = priority == 255 ? SCI_SCREEN_MASK_VISUAL : SCI_SCREEN_MASK_VISUAL|SCI_SCREEN_MASK_PRIORITY; + byte drawMask = priority == 255 ? GFX_SCREEN_MASK_VISUAL : GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY; int x, y; uint16 scalingX[320]; uint16 scalingY[200]; |