[Scummvm-git-logs] scummvm master -> 25a7fc6ab1cd386b1640a30a755f41e09bf3db4f

[sluicebox]

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:
0ff2062cfa SCI: Update flag debugger for ECO1 floppy 1.1
25a7fc6ab1 SCI: Don't create PRN file in ECO2


Commit: 0ff2062cfa0c505dfd0107452373ba50582ae1e0
    https://github.com/scummvm/scummvm/commit/0ff2062cfa0c505dfd0107452373ba50582ae1e0
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-10-05T13:46:00-07:00

Commit Message:
SCI: Update flag debugger for ECO1 floppy 1.1

Changed paths:
    engines/sci/engine/features.cpp


diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp
index eef3e909402..8c30a826f93 100644
--- a/engines/sci/engine/features.cpp
+++ b/engines/sci/engine/features.cpp
@@ -901,11 +901,10 @@ bool GameFeatures::canSaveFromGMM() const {
 
 uint16 GameFeatures::getGameFlagsGlobal() const {
 	Common::Platform platform = g_sci->getPlatform();
-	bool isCD = g_sci->isCD();
 	switch (g_sci->getGameId()) {
 	case GID_CAMELOT: return 250;
 	case GID_CASTLEBRAIN: return 250;
-	case GID_ECOQUEST: return isCD ? 152 : 150;
+	case GID_ECOQUEST: return (getSciVersion() == SCI_VERSION_1_1) ? 152 : 150;
 	case GID_ECOQUEST2: return 110;
 	case GID_FAIRYTALES: return 250;
 	case GID_FREDDYPHARKAS: return 186;


Commit: 25a7fc6ab1cd386b1640a30a755f41e09bf3db4f
    https://github.com/scummvm/scummvm/commit/25a7fc6ab1cd386b1640a30a755f41e09bf3db4f
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-10-05T13:46:00-07:00

Commit Message:
SCI: Don't create PRN file in ECO2

Ticket #14640

Changed paths:
    engines/sci/engine/kfile.cpp


diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 6b7d66ebdbc..6814c7e17f9 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -329,6 +329,13 @@ reg_t kFileIOOpen(EngineState *s, int argc, reg_t *argv) {
 		return SIGNAL_REG;
 	}
 
+	// ECO2 has a print feature in the Ecorder that writes text to PRN,
+	// which is a DOS alias for the printer. Ignore these attempts,
+	// otherwise an actual file will be created.
+	if (g_sci->getGameId() == GID_ECOQUEST2 && name == "prn") {
+		return SIGNAL_REG;
+	}
+
 #ifdef ENABLE_SCI32
 	// GK1, GK2, KQ7, LSL6hires, Phant1, PQ4, PQ:SWAT, and SQ6 read in
 	// their game version from the VERSION file