[Scummvm-git-logs] scummvm master -> ce5b400e4a60ee06ce1ddfefed4023c635b3bf46

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
480ca0d388 GLK: FROTZ: Fix display of Zork Zero title screen
ce5b400e4a GLK: FROTZ: Fix Coverity identified warnings


Commit: 480ca0d388e0002321bbc46dd7ee930dad28eef9
    https://github.com/scummvm/scummvm/commit/480ca0d388e0002321bbc46dd7ee930dad28eef9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-02-17T20:22:45-08:00

Commit Message:
GLK: FROTZ: Fix display of Zork Zero title screen

Changed paths:
    engines/glk/frotz/glk_interface.cpp


diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp
index 77f5d19..223931e 100644
--- a/engines/glk/frotz/glk_interface.cpp
+++ b/engines/glk/frotz/glk_interface.cpp
@@ -446,6 +446,10 @@ void GlkInterface::split_window(zword lines) {
 
 	if (h_version == V3)
 		glk_window_clear(_wp._upper);
+	if (h_version == V6) {
+		glk_window_clear(_wp._upper);
+		glk_window_clear(_wp._lower);
+	}
 }
 
 void GlkInterface::restart_screen() {


Commit: ce5b400e4a60ee06ce1ddfefed4023c635b3bf46
    https://github.com/scummvm/scummvm/commit/ce5b400e4a60ee06ce1ddfefed4023c635b3bf46
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-02-17T20:25:13-08:00

Commit Message:
GLK: FROTZ: Fix Coverity identified warnings

Changed paths:
    engines/glk/frotz/config.cpp
    engines/glk/frotz/processor_screen.cpp


diff --git a/engines/glk/frotz/config.cpp b/engines/glk/frotz/config.cpp
index 28e9c7f..be6c6df 100644
--- a/engines/glk/frotz/config.cpp
+++ b/engines/glk/frotz/config.cpp
@@ -147,7 +147,7 @@ void Header::loadHeader(Common::SeekableReadStream &f) {
 
 UserOptions::UserOptions() : _undo_slots(MAX_UNDO_SLOTS), _sound(true), _quetzal(true), _color_enabled(false),
 	_err_report_mode(ERR_REPORT_ONCE), _ignore_errors(false), _expand_abbreviations(false), _tandyBit(false),
-	_piracy(false), _script_cols(0), _left_margin(0), _right_margin(0) {
+	_piracy(false), _script_cols(0), _left_margin(0), _right_margin(0), _defaultBackground(0), _defaultForeground(0) {
 }
 
 void UserOptions::initialize(uint hVersion) {
diff --git a/engines/glk/frotz/processor_screen.cpp b/engines/glk/frotz/processor_screen.cpp
index 41932f5..2cc9080 100644
--- a/engines/glk/frotz/processor_screen.cpp
+++ b/engines/glk/frotz/processor_screen.cpp
@@ -193,7 +193,7 @@ void Processor::erase_screen(zword win) {
 	int curr_fg = _wp[1][TRUE_FG_COLOR];
 	int curr_bg = _wp[1][TRUE_BG_COLOR];
 
-	if (win == -1) {
+	if ((short)win == -1) {
 		if (_wp._upper) {
 			glk_set_window(_wp._upper);
 #ifdef GARGLK