aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/transitions.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-06 12:17:03 +0000
committerFilippos Karapetis2010-01-06 12:17:03 +0000
commitbcf7535c97ef6a49bbc9d110257caf7de49cfaed (patch)
tree7c2204ac4c31756f6ba5e5ac633cbfdb0ec8cdf8 /engines/sci/graphics/transitions.cpp
parent1c6ccf8000c8eb34e4ae3d68312a23261f87862c (diff)
downloadscummvm-rg350-bcf7535c97ef6a49bbc9d110257caf7de49cfaed.tar.gz
scummvm-rg350-bcf7535c97ef6a49bbc9d110257caf7de49cfaed.tar.bz2
scummvm-rg350-bcf7535c97ef6a49bbc9d110257caf7de49cfaed.zip
Removed all hardcoded screen sizes
svn-id: r47072
Diffstat (limited to 'engines/sci/graphics/transitions.cpp')
-rw-r--r--engines/sci/graphics/transitions.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/graphics/transitions.cpp b/engines/sci/graphics/transitions.cpp
index 565d628a67..c5cac0be89 100644
--- a/engines/sci/graphics/transitions.cpp
+++ b/engines/sci/graphics/transitions.cpp
@@ -170,7 +170,7 @@ void Transitions::doit(Common::Rect picRect) {
// Now we do the actual transition to the new screen
doTransition(_number, false);
- if (picRect.bottom != 320) {
+ if (picRect.bottom != _screen->_height) {
// TODO: this is a workaround for lsl6 not showing menubar when playing
// There is some new code in the sierra sci in ShowPic that seems to do something similar to this
_screen->copyToScreen();
@@ -305,10 +305,10 @@ void Transitions::pixelation (bool blackoutFlag) {
do {
mask = (mask & 1) ? (mask >> 1) ^ 0xB400 : mask >> 1;
- if (mask >= 320 * 200)
+ if (mask >= _screen->_width * _screen->_height)
continue;
- pixelRect.left = mask % 320; pixelRect.right = pixelRect.left + 1;
- pixelRect.top = mask / 320; pixelRect.bottom = pixelRect.top + 1;
+ pixelRect.left = mask % _screen->_width; pixelRect.right = pixelRect.left + 1;
+ pixelRect.top = mask / _screen->_width; pixelRect.bottom = pixelRect.top + 1;
pixelRect.clip(_picRect);
if (!pixelRect.isEmpty())
copyRectToScreen(pixelRect, blackoutFlag);