aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/gfx/resource
diff options
context:
space:
mode:
authorMax Horn2009-02-26 16:16:53 +0000
committerMax Horn2009-02-26 16:16:53 +0000
commit3343dca6dc9dfe18d4f5e5a280c1e9ffe50da3d3 (patch)
tree9b432909b43e06dcbbca515608d0d77b0545c0ad /engines/sci/gfx/resource
parentfde001ce8148caef9a3c6480cc870a1f0727ed6a (diff)
downloadscummvm-rg350-3343dca6dc9dfe18d4f5e5a280c1e9ffe50da3d3.tar.gz
scummvm-rg350-3343dca6dc9dfe18d4f5e5a280c1e9ffe50da3d3.tar.bz2
scummvm-rg350-3343dca6dc9dfe18d4f5e5a280c1e9ffe50da3d3.zip
SCI: Modified gfx_new_mode to take a Graphics::PixelFormat
svn-id: r38909
Diffstat (limited to 'engines/sci/gfx/resource')
-rw-r--r--engines/sci/gfx/resource/sci_pic_0.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp
index 4e470a9435..c8209cd172 100644
--- a/engines/sci/gfx/resource/sci_pic_0.cpp
+++ b/engines/sci/gfx/resource/sci_pic_0.cpp
@@ -1647,9 +1647,9 @@ void gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size,
p0printf("Embedded view @%d\n", pos);
// Set up mode structure for resizing the view
+ Graphics::PixelFormat format = { 1, 0, 0, 0, 0, 0, 0, 0, 0 }; // 1bpp, which handles masks and the rest for us
mode = gfx_new_mode(pic->visual_map->index_xl / 320,
- pic->visual_map->index_yl / 200, 1, // 1bpp, which handles masks and the rest for us
- 0, 0, 0, 0, 0, 0, 0, 0, 16, 0);
+ pic->visual_map->index_yl / 200, format, 16, 0);
GET_ABS_COORDS(posx, posy);
bytesize = (*(resource + pos)) + (*(resource + pos + 1) << 8);
@@ -1779,9 +1779,9 @@ void gfxr_draw_pic11(gfxr_pic_t *pic, int flags, int default_palette, int size,
gfx_mode_t *mode;
gfx_pixmap_t *view = NULL;
// Set up mode structure for resizing the view
+ Graphics::PixelFormat format = { 1, 0, 0, 0, 0, 0, 0, 0, 0 }; // 1bpp, which handles masks and the rest for us
mode = gfx_new_mode(pic->visual_map->index_xl / 320, pic->visual_map->index_yl / 200,
- 1, // 1bpp, which handles masks and the rest for us
- 0, 0, 0, 0, 0, 0, 0, 0, 16, 0);
+ format, 16, 0);
pic->visual_map->colors = gfxr_read_pal11(-1, &(pic->visual_map->colors_nr), resource + palette_data_ptr, 1284);