aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx/gfx_support.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2009-09-07 16:18:05 +0000
committerFilippos Karapetis2009-09-07 16:18:05 +0000
commit8fa0b431ee64b7c9105051981c6a62f30983e6fc (patch)
treea6814e9fcf6e2bc803b1cdcf2a9c22430bc2d7b7 /engines/sci/gfx/gfx_support.cpp
parentbebc76b4d8fd25ef84f22a7500df7e74b9714ddc (diff)
downloadscummvm-rg350-8fa0b431ee64b7c9105051981c6a62f30983e6fc.tar.gz
scummvm-rg350-8fa0b431ee64b7c9105051981c6a62f30983e6fc.tar.bz2
scummvm-rg350-8fa0b431ee64b7c9105051981c6a62f30983e6fc.zip
Merged xfact and yfact into scaleFactor - it doesn't really make sense to multiply one dimension with an integer multiplier which is different to the multiplier of the other dimension, otherwise we'll end up with funny looking and squashed resolutions like 640x200 or 320x400. Also, removed the now-unused pixelFormat member variable of the graphics driver struct
svn-id: r44003
Diffstat (limited to 'engines/sci/gfx/gfx_support.cpp')
-rw-r--r--engines/sci/gfx/gfx_support.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/gfx/gfx_support.cpp b/engines/sci/gfx/gfx_support.cpp
index 1f48a6d2ab..fa3b94835a 100644
--- a/engines/sci/gfx/gfx_support.cpp
+++ b/engines/sci/gfx/gfx_support.cpp
@@ -177,8 +177,8 @@ void _gfx_crossblit_simple(byte *dest, byte *src, int dest_line_width, int src_l
void gfx_crossblit_pixmap(gfx_mode_t *mode, gfx_pixmap_t *pxm, int priority, rect_t src_coords, rect_t dest_coords,
byte *dest, int dest_line_width, byte *priority_dest, int priority_line_width, int priority_skip, int flags) {
- int maxx = 320 * mode->xfact;
- int maxy = 200 * mode->yfact;
+ int maxx = 320 * mode->scaleFactor;
+ int maxy = 200 * mode->scaleFactor;
byte *src = pxm->data;
byte *alpha = pxm->alpha_map ? pxm->alpha_map : pxm->data;
byte *priority_pos = priority_dest;