[Scummvm-cvs-logs] SF.net SVN: scummvm:[38535] scummvm/trunk/engines/sci

[Kirben at users.sourceforge.net]

Revision: 38535
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38535&view=rev
Author:   Kirben
Date:     2009-02-19 04:16:20 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
Fix SCI 1.1 detection.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection.cpp
    scummvm/trunk/engines/sci/scicore/resource.cpp

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2009-02-19 04:14:16 UTC (rev 38534)
+++ scummvm/trunk/engines/sci/detection.cpp	2009-02-19 04:16:20 UTC (rev 38535)
@@ -247,6 +247,15 @@
 		SCI_VERSION(1, 000, 510)
 	},
 
+	// Eco Quest - English DOS CD 1.1
+	{{"ecoquest", "CD", {
+		{"resource.map", 0, "a4b73d5d2b55bdb6e44345e99c8fbdd0", 4804},
+		{"resource.000", 0, "d908dbef56816ac6c60dd145fdeafb2b", 3536046},
+		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0},
+		{},
+		SCI_VERSION(1, 001, 064)
+	},
+
 	// Eco Quest - Spanish DOS Floppy
 	{{"ecoquest", "Floppy", {
 		{"resource.map", 0, "82e6b1e3bdb2f064b18380009df7b345", 4395},

Modified: scummvm/trunk/engines/sci/scicore/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-19 04:14:16 UTC (rev 38534)
+++ scummvm/trunk/engines/sci/scicore/resource.cpp	2009-02-19 04:16:20 UTC (rev 38535)
@@ -551,8 +551,6 @@
 					_scir_init_trivial(mgr);
 					resource_error = 0;
 				}
-
-				*detected_version = SCI_VERSION_1;
 			}
 
 			mgr->sci_version = *detected_version;
@@ -676,10 +674,12 @@
 
 			if (res->status == SCI_STATUS_NOMALLOC)
 				mgr->sci_version = version = SCI_VERSION_1_LATE;
-
+			break;
+		}
+		case SCI_VERSION_1_1:
 			/* No need to handle SCI 1.1 here - it was done in resource_map.c */
+			version = SCI_VERSION_1_1;
 			break;
-		}
 		default:
 			sciprintf("Resmgr: Warning: While autodetecting: Couldn't"
 			          " determine SCI version!\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.