[Scummvm-cvs-logs] scummvm master -> d8eb01a7290e7a809b2e778fbb1eddada6854036

[bluegr]

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

Summary:
40865bc79e SCI: Add another version of LSL3 (bug #3611488)
c47a516430 SCI: Reorder the LSL3 detection entries a bit
d8eb01a729 SCI: Add the French floppy version of GK1 (bug #3611487)


Commit: 40865bc79e185f6a5807688ef634ef03fc3a9960
    https://github.com/scummvm/scummvm/commit/40865bc79e185f6a5807688ef634ef03fc3a9960
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-25T01:07:01-07:00

Commit Message:
SCI: Add another version of LSL3 (bug #3611488)

Changed paths:
    engines/sci/detection_tables.h



diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index c8137c8..a87c413 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1950,6 +1950,16 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 	 	Common::EN_ANY, Common::kPlatformPC, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// Larry 3 - English DOS (supplied by kervala in bug report #3611488)
+	{"lsl3", "", {
+		{"resource.map", 0, "534d8946f10bc71a71b5bf89a84c31be", 5916},
+		{"resource.001", 0, "f18441027154292836b973c655fa3175", 456265},
+		{"resource.002", 0, "f18441027154292836b973c655fa3175", 577059},
+		{"resource.003", 0, "f18441027154292836b973c655fa3175", 506817},
+		{"resource.004", 0, "f18441027154292836b973c655fa3175", 513337},
+		AD_LISTEND},
+	 	Common::EN_ANY, Common::kPlatformPC, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
 	// Larry 3 - English DOS Non-Interactive Demo
 	// SCI interpreter version 0.000.530
 	{"lsl3", "Demo", {


Commit: c47a51643011f366728307a17a7a6a9801519e44
    https://github.com/scummvm/scummvm/commit/c47a51643011f366728307a17a7a6a9801519e44
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-25T01:08:11-07:00

Commit Message:
SCI: Reorder the LSL3 detection entries a bit

Changed paths:
    engines/sci/detection_tables.h



diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index a87c413..3dd2de3 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1911,17 +1911,6 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 	 	Common::EN_ANY, Common::kPlatformAmiga, 0, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
-	// Larry 3 - English DOS
-	// SCI interpreter version 0.000.572
-	{"lsl3", "", {
-		{"resource.map", 0, "0b6bd3e039682830a51c5755c06591db", 5916},
-		{"resource.001", 0, "f18441027154292836b973c655fa3175", 456722},
-		{"resource.002", 0, "f18441027154292836b973c655fa3175", 578024},
-		{"resource.003", 0, "f18441027154292836b973c655fa3175", 506807},
-		{"resource.004", 0, "f18441027154292836b973c655fa3175", 513651},
-		AD_LISTEND},
-	 	Common::EN_ANY, Common::kPlatformPC, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
-
 	// Larry 3 - English DOS (supplied by ssburnout in bug report #3049193)
 	// 1.021 8x5.25" (label: Int#5.15.90)
 	{"lsl3", "", {
@@ -1950,6 +1939,17 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 	 	Common::EN_ANY, Common::kPlatformPC, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// Larry 3 - English DOS
+	// SCI interpreter version 0.000.572
+	{"lsl3", "", {
+		{"resource.map", 0, "0b6bd3e039682830a51c5755c06591db", 5916},
+		{"resource.001", 0, "f18441027154292836b973c655fa3175", 456722},
+		{"resource.002", 0, "f18441027154292836b973c655fa3175", 578024},
+		{"resource.003", 0, "f18441027154292836b973c655fa3175", 506807},
+		{"resource.004", 0, "f18441027154292836b973c655fa3175", 513651},
+		AD_LISTEND},
+	 	Common::EN_ANY, Common::kPlatformPC, 0, GUIO5(GUIO_NOSPEECH, GAMEOPTION_EGA_UNDITHER, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
 	// Larry 3 - English DOS (supplied by kervala in bug report #3611488)
 	{"lsl3", "", {
 		{"resource.map", 0, "534d8946f10bc71a71b5bf89a84c31be", 5916},


Commit: d8eb01a7290e7a809b2e778fbb1eddada6854036
    https://github.com/scummvm/scummvm/commit/d8eb01a7290e7a809b2e778fbb1eddada6854036
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-04-25T01:10:36-07:00

Commit Message:
SCI: Add the French floppy version of GK1 (bug #3611487)

Changed paths:
    engines/sci/detection_tables.h



diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index 3dd2de3..62d88ba 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -696,6 +696,14 @@ static const struct ADGameDescription SciGameDescriptions[] = {
 		AD_LISTEND},
 	 	Common::DE_DEU, Common::kPlatformPC, ADGF_UNSTABLE, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
 
+	// Gabriel Knight - French DOS Floppy (supplied my kervala in bug report #3611487)
+	// SCI interpreter version 2.000.000
+	{"gk1", "", {
+		{"resource.map", 0, "236e36cc847cdeafdd5e5fa8cba916ed", 10801},
+		{"resource.000", 0, "091cf08910780feabc56f8551b09cb36", 13033072},
+		AD_LISTEND},
+	 	Common::FR_FRA, Common::kPlatformPC, ADGF_UNSTABLE, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI)	},
+
 	// Gabriel Knight - English DOS CD (from jvprat)
 	// Executable scanning reports "2.000.000", VERSION file reports "01.100.000"
 	{"gk1", "CD", {