diff options
| author | Filippos Karapetis | 2009-09-06 22:27:29 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-06 22:27:29 +0000 |
| commit | 876a7b657fabd6722432fa3eface3137a12eb34f (patch) | |
| tree | e41e5e42e4298c80ae9d4ee226aa6989dae2c60a /engines/sci/gfx/gfx_tools.cpp | |
| parent | f98dc19f71f008af8642704aa13cd953f05de8e0 (diff) | |
| download | scummvm-rg350-876a7b657fabd6722432fa3eface3137a12eb34f.tar.gz scummvm-rg350-876a7b657fabd6722432fa3eface3137a12eb34f.tar.bz2 scummvm-rg350-876a7b657fabd6722432fa3eface3137a12eb34f.zip | |
Removed the hi-color code (16bpp & 24bpp). All SCI games use up to 256 colors, so hi-color isn't really used anywhere, and it only makes the overall code more complex for no reason
svn-id: r43994
Diffstat (limited to 'engines/sci/gfx/gfx_tools.cpp')
| -rw-r--r-- | engines/sci/gfx/gfx_tools.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/gfx/gfx_tools.cpp b/engines/sci/gfx/gfx_tools.cpp index 4beecf38f2..2a6550598e 100644 --- a/engines/sci/gfx/gfx_tools.cpp +++ b/engines/sci/gfx/gfx_tools.cpp @@ -48,7 +48,6 @@ gfx_mode_t *gfx_new_mode(int xfact, int yfact, const Graphics::PixelFormat &form mode->xfact = xfact; mode->yfact = yfact; - mode->bytespp = format.bytesPerPixel; mode->format = format; mode->palette = palette; @@ -56,8 +55,7 @@ gfx_mode_t *gfx_new_mode(int xfact, int yfact, const Graphics::PixelFormat &form } void gfx_free_mode(gfx_mode_t *mode) { - if (mode->palette) - mode->palette->free(); + mode->palette->free(); free(mode); mode = NULL; } @@ -183,7 +181,7 @@ gfx_pixmap_t *gfx_pixmap_alloc_data(gfx_pixmap_t *pixmap, gfx_mode_t *mode) { pixmap->height = pixmap->index_height * mode->yfact; } - size = pixmap->width * pixmap->height * mode->bytespp; + size = pixmap->width * pixmap->height; if (!size) size = 1; |