From 20cc4f3dd772a493a61038d1d1b22be87984a7bd Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Tue, 21 Apr 2009 19:57:11 +0000 Subject: Restored the ability to change the active port bound, by moving it inside gfx_state_t (it makes much more sense for it to be there, instead of inside user-defined settings). Placed notes inside gfxr_draw_pic01() and gfxr_draw_pic11() for the usage of the current titlebar size in there svn-id: r40057 --- engines/sci/engine/game.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'engines/sci/engine/game.cpp') 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; -- cgit v1.2.3