diff options
| author | Filippos Karapetis | 2010-11-09 22:20:36 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-11-09 22:20:36 +0000 |
| commit | e8e23a83e91d6b527f4a76eb2771f8ec1732c956 (patch) | |
| tree | 89702163f124bfa461feaa9ed3ed6e64fc36fa1b | |
| parent | 581a090204becdf7dbf73ecbc7cccdda105651a7 (diff) | |
| download | scummvm-rg350-e8e23a83e91d6b527f4a76eb2771f8ec1732c956.tar.gz scummvm-rg350-e8e23a83e91d6b527f4a76eb2771f8ec1732c956.tar.bz2 scummvm-rg350-e8e23a83e91d6b527f4a76eb2771f8ec1732c956.zip | |
SCI: Removed the Shivers 2 hack from the segment manager (it isn't SCI)
svn-id: r54174
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index cd4baa0ac3..d509046a15 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -946,18 +946,8 @@ void SegManager::freeString(reg_t addr) { void SegManager::createClassTable() { Resource *vocab996 = _resMan->findResource(ResourceId(kResourceTypeVocab, 996), 1); - if (!vocab996) { - if (getSciVersion() <= SCI_VERSION_2_1) { - error("SegManager: failed to open vocab 996"); - } else { - // TODO/FIXME: The demo of Shivers 2 has no vocabularies or scripts! - // This is either a problem with the resource manager, or the game is - // simply not using SCI. Since we are not actually running game scripts - // in SCI3, stop here for now - warning("SegManager: failed to open vocab 996 in SCI3"); - return; - } - } + if (!vocab996) + error("SegManager: failed to open vocab 996"); int totalClasses = vocab996->size >> 2; _classTable.resize(totalClasses); |