diff options
| author | Filippos Karapetis | 2009-09-07 16:18:05 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-07 16:18:05 +0000 |
| commit | 8fa0b431ee64b7c9105051981c6a62f30983e6fc (patch) | |
| tree | a6814e9fcf6e2bc803b1cdcf2a9c22430bc2d7b7 /engines/sci/gfx/picfill.cpp | |
| parent | bebc76b4d8fd25ef84f22a7500df7e74b9714ddc (diff) | |
| download | scummvm-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/picfill.cpp')
| -rw-r--r-- | engines/sci/gfx/picfill.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/gfx/picfill.cpp b/engines/sci/gfx/picfill.cpp index 6b909c27af..f48f7e938d 100644 --- a/engines/sci/gfx/picfill.cpp +++ b/engines/sci/gfx/picfill.cpp @@ -229,9 +229,9 @@ static void AUXBUF_FILL(gfxr_pic_t *pic, int x, int y, int clipmask, int control static void FILL_FUNCTION_RECURSIVE(gfxr_pic_t *pic, int old_xl, int old_xr, int y, int dy, byte *bounds, int legalcolor, int legalmask, int color, int priority, int drawenable, int sci_titlebar_size) { - int linewidth = pic->mode->xfact * 320; - int miny = pic->mode->yfact * sci_titlebar_size; - int maxy = pic->mode->yfact * 200; + int linewidth = pic->mode->scaleFactor * 320; + int miny = pic->mode->scaleFactor * sci_titlebar_size; + int maxy = pic->mode->scaleFactor * 200; int xl, xr; int oldytotal = y * linewidth; #ifdef DRAW_SCALED @@ -432,7 +432,7 @@ static void FILL_FUNCTION_RECURSIVE(gfxr_pic_t *pic, int old_xl, int old_xr, int static void FILL_FUNCTION(gfxr_pic_t *pic, int x_320, int y_200, int color, int priority, int control, int drawenable, int sci_titlebar_size) { - int linewidth = pic->mode->xfact * 320; + int linewidth = pic->mode->scaleFactor * 320; int x, y; int xl, xr; int ytotal; |