From e8e23a83e91d6b527f4a76eb2771f8ec1732c956 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 9 Nov 2010 22:20:36 +0000
Subject: SCI: Removed the Shivers 2 hack from the segment manager (it isn't
 SCI)

svn-id: r54174
---
 engines/sci/engine/seg_manager.cpp | 14 ++------------
 1 file 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);
-- 
cgit v1.2.3