diff options
| author | Max Horn | 2009-04-24 10:45:09 +0000 |
|---|---|---|
| committer | Max Horn | 2009-04-24 10:45:09 +0000 |
| commit | 86b36574767f0ab43e9e1f25dbe611ab7b35bf78 (patch) | |
| tree | 8fe38eec523e56b788e83766d267b2fb37457f78 /engines/sci/engine/game.cpp | |
| parent | 6fef323ec7bd028107118a01030844e019372dd3 (diff) | |
| download | scummvm-rg350-86b36574767f0ab43e9e1f25dbe611ab7b35bf78.tar.gz scummvm-rg350-86b36574767f0ab43e9e1f25dbe611ab7b35bf78.tar.bz2 scummvm-rg350-86b36574767f0ab43e9e1f25dbe611ab7b35bf78.zip | |
SCI: Started to C++ify the gfxw_widget_t codebase
svn-id: r40103
Diffstat (limited to 'engines/sci/engine/game.cpp')
| -rw-r--r-- | engines/sci/engine/game.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index b19db3475f..046d089d1a 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -149,7 +149,7 @@ int _reset_graphics_input(EngineState *s) { 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; + s->iconbar_port->_flags |= GFXW_FLAG_NO_IMPLICIT_SWITCH; if (s->resmgr->_sciVersion >= SCI_VERSION_01_VGA) { // This bit sets the foreground and background colors in VGA SCI games @@ -168,11 +168,11 @@ int _reset_graphics_input(EngineState *s) { } else { s->titlebar_port = gfxw_new_port(s->visual, NULL, gfx_rect(0, 0, 320, 10), s->ega_colors[0], s->ega_colors[15]); } - s->titlebar_port->color.mask |= GFX_MASK_PRIORITY; - s->titlebar_port->color.priority = 11; - s->titlebar_port->bgcolor.mask |= GFX_MASK_PRIORITY; - s->titlebar_port->bgcolor.priority = 11; - s->titlebar_port->flags |= GFXW_FLAG_NO_IMPLICIT_SWITCH; + s->titlebar_port->_color.mask |= GFX_MASK_PRIORITY; + s->titlebar_port->_color.priority = 11; + s->titlebar_port->_bgcolor.mask |= GFX_MASK_PRIORITY; + s->titlebar_port->_bgcolor.priority = 11; + s->titlebar_port->_flags |= GFXW_FLAG_NO_IMPLICIT_SWITCH; // but this is correct s->picture_port = gfxw_new_port(s->visual, NULL, s->gfx_state->pic_port_bounds, s->ega_colors[0], transparent); @@ -188,8 +188,8 @@ int _reset_graphics_input(EngineState *s) { s->port = s->picture_port; // Currently using the picture port #if 0 - s->titlebar_port->bgcolor.mask |= GFX_MASK_PRIORITY; - s->titlebar_port->bgcolor.priority = 11; // Standard priority for the titlebar port + s->titlebar_port->_bgcolor.mask |= GFX_MASK_PRIORITY; + s->titlebar_port->_bgcolor.priority = 11; // Standard priority for the titlebar port #endif return 0; |