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

bluegr md5 at scummvm.org
Sat Sep 10 12:08:26 CEST 2011


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

Summary:
fa654e942a SCI: Added handling of cnick-kq and cnick-longbow in the fallback detector


Commit: fa654e942adc5b7c6a01cd61c1d85dfdab4f8c14
    https://github.com/scummvm/scummvm/commit/fa654e942adc5b7c6a01cd61c1d85dfdab4f8c14
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-10T03:02:15-07:00

Commit Message:
SCI: Added handling of cnick-kq and cnick-longbow in the fallback detector

Changed paths:
    engines/sci/detection.cpp



diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 33ca3a6..56da696 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -296,8 +296,10 @@ Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, R
 		sierraId == "mg" || sierraId == "pq" ||
 		sierraId == "jones" ||
 		sierraId == "cardgames" || sierraId == "solitare" ||
-		sierraId == "hoyle3" || sierraId == "hoyle4")
+		sierraId == "hoyle4")
 		demoThreshold = 40;
+	if (sierraId == "hoyle3")
+		demoThreshold = 45;	// cnick-kq has 42 scripts. The actual hoyle 3 demo has 27.
 	if (sierraId == "fp" || sierraId == "gk" || sierraId == "pq4")
 		demoThreshold = 150;
 
@@ -310,8 +312,11 @@ Common::String convertSierraGameId(Common::String sierraId, uint32 *gameFlags, R
 			return "cnick-lsl";
 		if (sierraId == "sq4" && resources->size() == 34)
 			return "cnick-sq";
-
-		// TODO: cnick-kq, cnick-laurabow and cnick-longbow (their resources can't be read)
+		if (sierraId == "hoyle3" && resources->size() == 42)
+			return "cnick-kq";
+		if (sierraId == "rh budget" && resources->size() == 39)
+			return "cnick-longbow";
+		// TODO: cnick-laurabow (the name of the game object contains junk)
 
 		// Handle Astrochicken 1 (SQ3) and 2 (SQ4)
 		if (sierraId == "sq3" && resources->size() == 20)






More information about the Scummvm-git-logs mailing list