[Scummvm-git-logs] scummvm master -> 2df38d8b2c4615ab35cee9a2607255803c1bf573

[bluegr]

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:
a3f6b94251 SCI32: Add the French version of PQ:SWAT (bug #11100)
2df38d8b2c SCI32: Handle the special Bridge save/load screens in Hoyle 5


Commit: a3f6b942512d332fafa6d00aa7d1f75cc7a776dd
    https://github.com/scummvm/scummvm/commit/a3f6b942512d332fafa6d00aa7d1f75cc7a776dd
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2019-10-05T15:45:02+03:00

Commit Message:
SCI32: Add the French version of PQ:SWAT (bug #11100)

Changed paths:
    engines/sci/detection_tables.h


diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index f279f9a..b5b0050 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -3747,6 +3747,20 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformDOS, ADGF_UNSTABLE, GUIO_PQSWAT },
 
+	// Police Quest: SWAT - French 1.100 DOS/Windows
+	// Reported by e-Scarlatti in bug #11100
+	{"pqswat", "", {
+		{"resmap.001", 0, "10abf5d5571f23685604e6d833250ddf", 10066},
+		{"ressci.001", 0, "b2bd962abeb3c1239773fdf7a530231c", 29529649},
+		{"resmap.002", 0, "89c20793199107e78354c6ce7a284b07", 9490},
+		{"ressci.002", 0, "b2bd962abeb3c1239773fdf7a530231c", 31853152},
+		{"resmap.003", 0, "4f4ba573934b1d27d3e4f31116d1d6d9", 9880},
+		{"ressci.003", 0, "b2bd962abeb3c1239773fdf7a530231c", 46769998},
+		{"resmap.004", 0, "93c7638e131b28a251985c5114b14838", 10162},
+		{"ressci.004", 0, "b2bd962abeb3c1239773fdf7a530231c", 50998883},
+		AD_LISTEND},
+		Common::FR_FRA, Common::kPlatformDOS, ADGF_UNSTABLE, GUIO_PQSWAT },
+
 #undef GUIO_PQSWAT_DEMO
 #undef GUIO_PQSWAT
 


Commit: 2df38d8b2c4615ab35cee9a2607255803c1bf573
    https://github.com/scummvm/scummvm/commit/2df38d8b2c4615ab35cee9a2607255803c1bf573
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2019-10-05T15:49:26+03:00

Commit Message:
SCI32: Handle the special Bridge save/load screens in Hoyle 5

Fixes saving/loading the Bridge hands using the ScummVM save/load
screens - bug #11174

Changed paths:
    engines/sci/engine/guest_additions.cpp
    engines/sci/engine/guest_additions.h


diff --git a/engines/sci/engine/guest_additions.cpp b/engines/sci/engine/guest_additions.cpp
index 8cf8c05..cf70608 100644
--- a/engines/sci/engine/guest_additions.cpp
+++ b/engines/sci/engine/guest_additions.cpp
@@ -527,6 +527,10 @@ reg_t GuestAdditions::kScummVMSaveLoad(EngineState *s, int argc, reg_t *argv) co
 		return promptSaveRestoreRama(s, argc, argv);
 	}
 
+	if (g_sci->getGameId() == GID_HOYLE5) {
+		return promptSaveRestoreHoyle5(s, argc, argv);
+	}
+
 	return promptSaveRestoreDefault(s, argc, argv);
 }
 
@@ -715,6 +719,13 @@ int GuestAdditions::runSaveRestore(const bool isSave, reg_t outDescription, cons
 	return saveNo;
 }
 
+reg_t GuestAdditions::promptSaveRestoreHoyle5(EngineState *s, int argc, reg_t *argv) const {
+	assert(argc == 2);
+	Common::String callerName = s->_segMan->getObjectName(s->r_acc);
+	const bool isSave = (callerName == "Save");
+	return make_reg(0, runSaveRestore(isSave, argc > 0 ? argv[0] : NULL_REG, s->_delayedRestoreGameId));
+}
+
 #endif
 
 #pragma mark -
diff --git a/engines/sci/engine/guest_additions.h b/engines/sci/engine/guest_additions.h
index b49fe9d..b889c49 100644
--- a/engines/sci/engine/guest_additions.h
+++ b/engines/sci/engine/guest_additions.h
@@ -257,6 +257,12 @@ private:
 	reg_t promptSaveRestoreRama(EngineState *s, int argc, reg_t *argv) const;
 
 	/**
+	 * Prompts for a save game and returns it to game scripts using Hoyle 5's
+	 * custom SRDialog class semantics.
+	 */
+	reg_t promptSaveRestoreHoyle5(EngineState *s, int argc, reg_t *argv) const;
+
+	/**
 	 * Prompts the user to save or load a game.
 	 *
 	 * @param isSave If true, the prompt is for saving.