diff options
| author | Paul Gilbert | 2019-02-23 12:16:27 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2019-02-23 12:16:27 -0800 |
| commit | bedab5bd460452ad34ea3c820722a85f015695b0 (patch) | |
| tree | 639aa7e380bfaf43635c04f95eb3097c24e0a054 /engines/glk/frotz/glk_interface.cpp | |
| parent | eacc4e52d14a4929323df30da6346b6bbacda9b8 (diff) | |
| download | scummvm-rg350-bedab5bd460452ad34ea3c820722a85f015695b0.tar.gz scummvm-rg350-bedab5bd460452ad34ea3c820722a85f015695b0.tar.bz2 scummvm-rg350-bedab5bd460452ad34ea3c820722a85f015695b0.zip | |
GLK: FROTZ: Fix colors for Beyond Zork
As part of that, I've made the default bg Black rather than blue,
since it provides better contrast for the upper area & minimap
Diffstat (limited to 'engines/glk/frotz/glk_interface.cpp')
| -rw-r--r-- | engines/glk/frotz/glk_interface.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp index dda932dc3d..aa5139f7c1 100644 --- a/engines/glk/frotz/glk_interface.cpp +++ b/engines/glk/frotz/glk_interface.cpp @@ -51,7 +51,7 @@ void GlkInterface::initialize() { uint width, height; /* Setup options */ - UserOptions::initialize(h_version); + UserOptions::initialize(h_version, _storyId); /* Setup colors array */ const int COLOR_MAP[zcolor_NUMCOLORS - 2] = { @@ -158,23 +158,26 @@ void GlkInterface::initialize() { h_interpreter_number = h_version == 6 ? INTERP_MSDOS : INTERP_AMIGA; h_interpreter_version = 'F'; + // Set these per spec 8.3.2. + h_default_foreground = WHITE_COLOUR; + h_default_background = BLACK_COLOUR; + // Set up the foreground & background _color_enabled = ((h_version >= 5) && (h_flags & COLOUR_FLAG)) - || (_defaultForeground != zcolor_Transparent) || (_defaultBackground != zcolor_Transparent); + || (_defaultForeground != zcolor_Transparent) || (_defaultBackground != zcolor_Transparent); if (_color_enabled) { h_config |= CONFIG_COLOUR; h_flags |= COLOUR_FLAG; // FIXME: beyond zork handling? - h_default_foreground = BLACK_COLOUR; - h_default_background = WHITE_COLOUR; + if (h_version == 6) { + h_default_foreground = BLACK_COLOUR; + h_default_background = WHITE_COLOUR; + } + zcolors[h_default_foreground] = _defaultForeground; zcolors[h_default_background] = _defaultBackground; } else { - // Set these per spec 8.3.2. - h_default_foreground = WHITE_COLOUR; - h_default_background = BLACK_COLOUR; - if (h_flags & COLOUR_FLAG) h_flags &= ~COLOUR_FLAG; } |