[Scummvm-cvs-logs] SF.net SVN: scummvm:[54174] scummvm/trunk/engines/sci/engine/seg_manager. cpp

[thebluegr at users.sourceforge.net]

Revision: 54174
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54174&view=rev
Author:   thebluegr
Date:     2010-11-09 22:20:36 +0000 (Tue, 09 Nov 2010)

Log Message:
-----------
SCI: Removed the Shivers 2 hack from the segment manager (it isn't SCI)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-11-09 22:01:12 UTC (rev 54173)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2010-11-09 22:20:36 UTC (rev 54174)
@@ -946,18 +946,8 @@
 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);


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