diff options
Diffstat (limited to 'engines/sci/resource.cpp')
| -rw-r--r-- | engines/sci/resource.cpp | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 52c079e829..6368f40cc1 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -509,16 +509,9 @@ ResourceManager::ResourceManager(int version, int maxMemory) { case SCI_VERSION_01_VGA_ODD: version = _mapVersion; break; - case SCI_VERSION_1: { - Resource *res = testResource(ResourceId(kResourceTypeScript, 0)); - - _sciVersion = version = SCI_VERSION_1_EARLY; - loadResource(res); - - if (res->status == kResStatusNoMalloc) - version = SCI_VERSION_1_LATE; + case SCI_VERSION_1: + _sciVersion = version = SCI_VERSION_1; break; - } case SCI_VERSION_1_1: // No need to handle SCI 1.1 here - it was done in resource_map.cpp version = SCI_VERSION_1_1; @@ -542,11 +535,8 @@ ResourceManager::ResourceManager(int version, int maxMemory) { case SCI_VERSION_01_VGA_ODD: debug("Resmgr: Detected SCI01VGA - Jones/CD or similar"); break; - case SCI_VERSION_1_EARLY: - debug("Resmgr: Detected SCI1 Early"); - break; - case SCI_VERSION_1_LATE: - debug("Resmgr: Detected SCI1 Late"); + case SCI_VERSION_1: + debug("Resmgr: Detected SCI1"); break; case SCI_VERSION_1_1: debug("Resmgr: Detected SCI1.1"); |