diff options
author | Travis Howell | 2009-02-19 04:16:20 +0000 |
---|---|---|
committer | Travis Howell | 2009-02-19 04:16:20 +0000 |
commit | 0ac07498102218f1c0ba83b82bff15dcd439abf4 (patch) | |
tree | a2707821a2d9619f56001669a2fae4528f5b0d1d | |
parent | 3d78df8d638584f8529c7abe37ec092170869d9a (diff) | |
download | scummvm-rg350-0ac07498102218f1c0ba83b82bff15dcd439abf4.tar.gz scummvm-rg350-0ac07498102218f1c0ba83b82bff15dcd439abf4.tar.bz2 scummvm-rg350-0ac07498102218f1c0ba83b82bff15dcd439abf4.zip |
Fix SCI 1.1 detection.
svn-id: r38535
-rw-r--r-- | engines/sci/detection.cpp | 9 | ||||
-rw-r--r-- | engines/sci/scicore/resource.cpp | 8 |
2 files changed, 13 insertions, 4 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 8531fbe592..61139122d2 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -247,6 +247,15 @@ static const struct SciGameDescription SciGameDescriptions[] = { 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}, diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index 68cd5e985b..21af0711d7 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -551,8 +551,6 @@ _scir_scan_new_sources(resource_mgr_t *mgr, int *detected_version, resource_sour _scir_init_trivial(mgr); resource_error = 0; } - - *detected_version = SCI_VERSION_1; } mgr->sci_version = *detected_version; @@ -676,10 +674,12 @@ scir_new_resource_manager(char *dir, int version, if (res->status == SCI_STATUS_NOMALLOC) mgr->sci_version = version = SCI_VERSION_1_LATE; - - /* No need to handle SCI 1.1 here - it was done in resource_map.c */ 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"); |