diff options
author | Paul Gilbert | 2018-11-18 14:54:43 -0800 |
---|---|---|
committer | Paul Gilbert | 2018-12-08 19:05:59 -0800 |
commit | dfe497cb79b52a4835700f806e5eb5a17543dd37 (patch) | |
tree | 6d990a2c28f410e11b26985b9c8aca15316dc3de | |
parent | 2a3e6c49bf6d664d7c91dd17e41e97f042f70206 (diff) | |
download | scummvm-rg350-dfe497cb79b52a4835700f806e5eb5a17543dd37.tar.gz scummvm-rg350-dfe497cb79b52a4835700f806e5eb5a17543dd37.tar.bz2 scummvm-rg350-dfe497cb79b52a4835700f806e5eb5a17543dd37.zip |
GLK: FROTZ: Move setting default colors to GlkInterface
-rw-r--r-- | engines/glk/frotz/frotz.cpp | 3 | ||||
-rw-r--r-- | engines/glk/frotz/glk_interface.cpp | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/glk/frotz/frotz.cpp b/engines/glk/frotz/frotz.cpp index 6b79cfa060..58287900d9 100644 --- a/engines/glk/frotz/frotz.cpp +++ b/engines/glk/frotz/frotz.cpp @@ -50,9 +50,6 @@ void Frotz::initialize() { // Call process initialization Processor::initialize(); - // Set the screen colors - garglk_set_zcolors(_defaultForeground, _defaultBackground); - // Restart the game z_restart(); } diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp index 477891ad70..a8b25a2d76 100644 --- a/engines/glk/frotz/glk_interface.cpp +++ b/engines/glk/frotz/glk_interface.cpp @@ -106,6 +106,9 @@ void GlkInterface::initialize() { glk_set_window(gos_lower); gos_curwin = gos_lower; + // Set the screen colors + garglk_set_zcolors(_defaultForeground, _defaultBackground); + /* * Icky magic bit setting */ @@ -148,13 +151,13 @@ void GlkInterface::initialize() { h_font_width = 1; h_font_height = 1; - /* Must be after screen dimensions are computed. */ + // Must be after screen dimensions are computed if (h_version == V6) { h_flags &= ~GRAPHICS_FLAG; } // Use the ms-dos interpreter number for v6, because that's the - // kind of graphics files we understand. Otherwise, use DEC. + // kind of graphics files we understand h_interpreter_number = h_version == 6 ? INTERP_MSDOS : INTERP_AMIGA; h_interpreter_version = 'F'; |