aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gfx/gfx_resmgr.cpp4
-rw-r--r--engines/sci/gfx/gfx_resource.h1
-rw-r--r--engines/sci/gfx/res_pic.cpp14
3 files changed, 12 insertions, 7 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp
index 7258418ec1..c4cea09365 100644
--- a/engines/sci/gfx/gfx_resmgr.cpp
+++ b/engines/sci/gfx/gfx_resmgr.cpp
@@ -88,15 +88,11 @@ int GfxResManager::calculatePic(gfxr_pic_t *scaled_pic, gfxr_pic_t *unscaled_pic
basic_style.brush_mode = GFX_BRUSH_MODE_SCALED;
#ifdef CUSTOM_GRAPHICS_OPTIONS
- basic_style.pic_port_bounds = _options->pic_port_bounds;
style.line_mode = _options->pic0_line_mode;
style.brush_mode = _options->pic0_brush_mode;
- style.pic_port_bounds = _options->pic_port_bounds;
#else
- basic_style.pic_port_bounds = gfx_rect(0, 10, 320, 190);
style.line_mode = GFX_LINE_MODE_CORRECT;
style.brush_mode = GFX_BRUSH_MODE_RANDOM_ELLIPSES;
- style.pic_port_bounds = gfx_rect(0, 10, 320, 190);
#endif
if (!res || !res->data)
diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h
index 6479badb92..3d49b927a9 100644
--- a/engines/sci/gfx/gfx_resource.h
+++ b/engines/sci/gfx/gfx_resource.h
@@ -74,7 +74,6 @@ extern Palette* gfx_sci0_pic_colors;
struct gfxr_pic0_params_t {
gfx_line_mode_t line_mode; /* one of GFX_LINE_MODE_* */
gfx_brush_mode_t brush_mode;
- rect_t pic_port_bounds;
};
struct gfxr_pic_t {
diff --git a/engines/sci/gfx/res_pic.cpp b/engines/sci/gfx/res_pic.cpp
index 52aeac5f7c..39906e7fbf 100644
--- a/engines/sci/gfx/res_pic.cpp
+++ b/engines/sci/gfx/res_pic.cpp
@@ -1314,7 +1314,12 @@ void gfxr_draw_pic01(gfxr_pic_t *pic, int flags, int default_palette, int size,
int pal, index;
int temp;
int line_mode = style->line_mode;
- int sci_titlebar_size = style->pic_port_bounds.y;
+ int sci_titlebar_size;
+#ifdef CUSTOM_GRAPHICS_OPTIONS
+ sci_titlebar_size = _options->pic_port_bounds.y;
+#else
+ sci_titlebar_size = 10;
+#endif
byte op, opx;
#ifdef FILL_RECURSIVE_DEBUG
@@ -1784,7 +1789,12 @@ void gfxr_draw_pic11(gfxr_pic_t *pic, int flags, int default_palette, int size,
int vector_data_ptr = READ_LE_UINT16(resource + 16);
int palette_data_ptr = READ_LE_UINT16(resource + 28);
int bitmap_data_ptr = READ_LE_UINT16(resource + 32);
- int sci_titlebar_size = style->pic_port_bounds.y;
+ int sci_titlebar_size;
+#ifdef CUSTOM_GRAPHICS_OPTIONS
+ sci_titlebar_size = _options->pic_port_bounds.y;
+#else
+ sci_titlebar_size = 10;
+#endif
gfx_pixmap_t *view = NULL;
if (pic->visual_map->palette) pic->visual_map->palette->free();