diff options
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/game.cpp | 13 | ||||
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 16 |
2 files changed, 6 insertions, 23 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index 4c76a72272..9d79d8e65c 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -163,11 +163,8 @@ int _reset_graphics_input(EngineState *s) { s->visual = gfxw_new_visual(s->gfx_state, font_nr); -#ifdef CUSTOM_GRAPHICS_OPTIONS - s->wm_port = gfxw_new_port(s->visual, NULL, s->gfx_state->options->pic_port_bounds, s->ega_colors[0], transparent); -#else - s->wm_port = gfxw_new_port(s->visual, NULL, gfx_rect(0, 10, 320, 190), s->ega_colors[0], transparent); -#endif + s->wm_port = gfxw_new_port(s->visual, NULL, s->gfx_state->pic_port_bounds, s->ega_colors[0], transparent); + s->iconbar_port = gfxw_new_port(s->visual, NULL, gfx_rect(0, 0, 320, 200), s->ega_colors[0], transparent); s->iconbar_port->flags |= GFXW_FLAG_NO_IMPLICIT_SWITCH; @@ -195,11 +192,7 @@ int _reset_graphics_input(EngineState *s) { s->titlebar_port->flags |= GFXW_FLAG_NO_IMPLICIT_SWITCH; // but this is correct -#ifdef CUSTOM_GRAPHICS_OPTIONS - s->picture_port = gfxw_new_port(s->visual, NULL, s->gfx_state->options->pic_port_bounds, s->ega_colors[0], transparent); -#else - s->picture_port = gfxw_new_port(s->visual, NULL, gfx_rect(0, 10, 320, 190), s->ega_colors[0], transparent); -#endif + s->picture_port = gfxw_new_port(s->visual, NULL, s->gfx_state->pic_port_bounds, s->ega_colors[0], transparent); s->pics_drawn_nr = 0; diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index e4dbab22f5..b96c91fd4b 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -1030,13 +1030,8 @@ reg_t kDrawPic(EngineState *s, int funct_nr, int argc, reg_t *argv) { s->picture_port->widfree(GFXW(s->picture_port)); s->iconbar_port->widfree(GFXW(s->iconbar_port)); -#ifdef CUSTOM_GRAPHICS_OPTIONS - s->wm_port = gfxw_new_port(s->visual, NULL, s->gfx_state->options->pic_port_bounds, s->ega_colors[0], transparent); - s->picture_port = gfxw_new_port(s->visual, NULL, s->gfx_state->options->pic_port_bounds, s->ega_colors[0], transparent); -#else - s->wm_port = gfxw_new_port(s->visual, NULL, gfx_rect(0, 10, 320, 190), s->ega_colors[0], transparent); - s->picture_port = gfxw_new_port(s->visual, NULL, gfx_rect(0, 10, 320, 190), s->ega_colors[0], transparent); -#endif + s->wm_port = gfxw_new_port(s->visual, NULL, s->gfx_state->pic_port_bounds, s->ega_colors[0], transparent); + s->picture_port = gfxw_new_port(s->visual, NULL, s->gfx_state->pic_port_bounds, s->ega_colors[0], transparent); s->iconbar_port = gfxw_new_port(s->visual, NULL, gfx_rect(0, 0, 320, 200), s->ega_colors[0], transparent); s->iconbar_port->flags |= GFXW_FLAG_NO_IMPLICIT_SWITCH; @@ -2386,13 +2381,8 @@ reg_t kSetPort(EngineState *s, int funct_nr, int argc, reg_t *argv) { return s->r_acc; } - // This should never occur. This case happens when the port is supplied via command line parameters -#ifdef CUSTOM_GRAPHICS_OPTIONS - s->gfx_state->options->pic_port_bounds = gfx_rect(UKPV(5), UKPV(4), + s->gfx_state->pic_port_bounds = gfx_rect(UKPV(5), UKPV(4), UKPV(3), UKPV(2)); -#else - warning("kSetPort() was called to change the picture port bounds, but custom graphics options are not enabled, so it has been ignored"); -#endif // FIXME: Should really only invalidate all loaded pic resources here; // this is overkill |