[Scummvm-git-logs] scummvm master -> 7868931f0cd5c1a29d114c339dbe3050b4d3c7d4

[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:
68d83216f0 GLK: GLULX: Fix reading initial gamestate for Counterfeit Monkey
7868931f0c GLK: GLULX: Fix crash doing fillRect on an empty rect


Commit: 68d83216f06279edf4b1983a763bcb9819cdbc95
    https://github.com/scummvm/scummvm/commit/68d83216f06279edf4b1983a763bcb9819cdbc95
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-22T19:40:55-08:00

Commit Message:
GLK: GLULX: Fix reading initial gamestate for Counterfeit Monkey

Changed paths:
    engines/glk/glulx/detection_tables.h
    engines/glk/glulx/exec.cpp
    engines/glk/glulx/serial.cpp


diff --git a/engines/glk/glulx/detection_tables.h b/engines/glk/glulx/detection_tables.h
index 8607f0fca1..55d78f539c 100644
--- a/engines/glk/glulx/detection_tables.h
+++ b/engines/glk/glulx/detection_tables.h
@@ -392,6 +392,7 @@ const GlkDetectionEntry GLULXE_GAMES[] = {
 	DT_ENTRY1("counterfeitmonkey", "160520", "24b94c1d870740880629983fc181d7b8", 14806568),
 	DT_ENTRY1("counterfeitmonkey", "171224", "340232662aa8e9f4d45726e8ca7f9f5a", 12580166),
 	DT_ENTRY1("counterfeitmonkey", "181204", "c3e41db7aa8642f40b157c51fa91a26b", 12348938),
+	DT_ENTRY1("counterfeitmonkey", "", "493169aff19d6c1b42649197b7fbb6e0", 12400746),
 	DT_ENTRY1("countingcrabs", "090728", "ffc19674d99b4d6f530bb00287c83c7e", 1508676),
 	DT_ENTRY1("crackcoldone", "170706", "c2d5bf64a0aadaead7640b5750826d55", 627136),
 	DT_ENTRY1("crackcoldone", "170711", "d64bd51d8fe05dc190ac3589e11b6ea6", 627136),
diff --git a/engines/glk/glulx/exec.cpp b/engines/glk/glulx/exec.cpp
index eecd47adb6..3ff7bb3543 100644
--- a/engines/glk/glulx/exec.cpp
+++ b/engines/glk/glulx/exec.cpp
@@ -695,7 +695,7 @@ PerformJump: /* goto label for successful jumping... ironic, no? */
 				if (value == 0) {
 					/* We've succeeded, and the stack now contains the callstub
 					   saved during saveundo. Ignore this opcode's operand. */
-					value = (uint) - 1;
+					value = (uint)-1;
 					pop_callstub(value);
 				} else {
 					/* We've failed, so we must store the failure in this opcode's
diff --git a/engines/glk/glulx/serial.cpp b/engines/glk/glulx/serial.cpp
index 22e0a2a326..1faa1b7ab6 100644
--- a/engines/glk/glulx/serial.cpp
+++ b/engines/glk/glulx/serial.cpp
@@ -228,7 +228,7 @@ uint Glulx::perform_restoreundo() {
 Common::Error Glulx::readSaveData(Common::SeekableReadStream *rs) {
 	Common::ErrorCode errCode = Common::kNoError;
 	QuetzalReader r;
-	if (r.open(rs, ID_IFSF))
+	if (r.open(rs))
 		// Load in the savegame chunks
 		errCode = loadGameChunks(r).getCode();
 


Commit: 7868931f0cd5c1a29d114c339dbe3050b4d3c7d4
    https://github.com/scummvm/scummvm/commit/7868931f0cd5c1a29d114c339dbe3050b4d3c7d4
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-12-22T19:40:55-08:00

Commit Message:
GLK: GLULX: Fix crash doing fillRect on an empty rect

Changed paths:
    engines/glk/window_graphics.cpp


diff --git a/engines/glk/window_graphics.cpp b/engines/glk/window_graphics.cpp
index 95942f3fd7..bf5514c321 100644
--- a/engines/glk/window_graphics.cpp
+++ b/engines/glk/window_graphics.cpp
@@ -173,7 +173,9 @@ void GraphicsWindow::fillRect(uint color, const Rect &box) {
 	// zero out hyperlinks for these coordinates
 	g_vm->_selection->putHyperlink(0, hx0, hy0, hx1, hy1);
 
-	_surface->fillRect(Rect(x0, y0, x1, y1), color);
+	Rect r(x0, y0, x1, y1);
+	if (!r.isEmpty())
+		_surface->fillRect(r, color);
 	touch();
 }