diff options
author | Filippos Karapetis | 2009-10-25 20:53:07 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-10-25 20:53:07 +0000 |
commit | 1a4b61739832a1f1d597b9c56e67dd8b80b32f76 (patch) | |
tree | 3c80fcc922210f4e89b134443b45bba8365febbe /engines/sci/gfx/gfx_pixmap_scale.cpp | |
parent | 0315264328af6b34a4c9e1028bba07a636da5df8 (diff) | |
download | scummvm-rg350-1a4b61739832a1f1d597b9c56e67dd8b80b32f76.tar.gz scummvm-rg350-1a4b61739832a1f1d597b9c56e67dd8b80b32f76.tar.bz2 scummvm-rg350-1a4b61739832a1f1d597b9c56e67dd8b80b32f76.zip |
- Removed graphics options code from the old GUI. Almost all of them are not supposed to be modified by the user (e.g. the way lines and brushes are drawn), and we can implement any of them again if needed in the new GUI (but they shouldn't really be needed).
- Added a config option to disable dithering in the new GUI if requested, called "undither", which is set to true by default and can be changed to false if needed per game
- The per-resource palette code has been removed for now, to be replaced by regular hashmaps (once the FreeSCI scifx reading code has been converted)
svn-id: r45378
Diffstat (limited to 'engines/sci/gfx/gfx_pixmap_scale.cpp')
-rw-r--r-- | engines/sci/gfx/gfx_pixmap_scale.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/engines/sci/gfx/gfx_pixmap_scale.cpp b/engines/sci/gfx/gfx_pixmap_scale.cpp index 5681bdac1c..5b126f71d2 100644 --- a/engines/sci/gfx/gfx_pixmap_scale.cpp +++ b/engines/sci/gfx/gfx_pixmap_scale.cpp @@ -99,13 +99,8 @@ static void _gfx_xlate_pixmap_unfiltered(gfx_mode_t *mode, gfx_pixmap_t *pxm, in } } - if (pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX) { - pxm->width = pxm->index_width; - pxm->height = pxm->index_height; - } else { - pxm->width = pxm->index_width * mode->scaleFactor; - pxm->height = pxm->index_height * mode->scaleFactor; - } + pxm->width = pxm->index_width; + pxm->height = pxm->index_height; } @@ -123,7 +118,7 @@ void gfx_xlate_pixmap(gfx_pixmap_t *pxm, gfx_mode_t *mode) { pxm->alpha_map = (byte*)malloc(mode->scaleFactor * mode->scaleFactor * pxm->index_width * pxm->index_height + 1); } - _gfx_xlate_pixmap_unfiltered(mode, pxm, !(pxm->flags & GFX_PIXMAP_FLAG_SCALED_INDEX)); + _gfx_xlate_pixmap_unfiltered(mode, pxm, false); if (pxm->palette) pxm->palette_revision = pxm->palette->getRevision(); |