[Scummvm-cvs-logs] SF.net SVN: scummvm:[54173] scummvm/trunk/engines/sci

[thebluegr at users.sourceforge.net]

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

Log Message:
-----------
SCI3: Removed detection and any possible support of Shivers 2

Shivers 2 doesn't contain SCI scripts. The whole game logic has
been reimplemented from SCI in native code placed in DLL files.
Each room has its own DLL file, and some SCI functions have been
reimplemented/rewritten for this purpose in native code. The
game and demo have all the resources of a SCI game, apart from
the SCI scripts themselves. Thus, they cannot be directly
supported, unless their whole room logic is rewritten from
scratch, which classifies Shivers 2 as "not SCI"

Modified Paths:
--------------
    scummvm/trunk/engines/sci/detection.cpp
    scummvm/trunk/engines/sci/detection_tables.h
    scummvm/trunk/engines/sci/sci.h

Modified: scummvm/trunk/engines/sci/detection.cpp
===================================================================
--- scummvm/trunk/engines/sci/detection.cpp	2010-11-09 21:31:23 UTC (rev 54172)
+++ scummvm/trunk/engines/sci/detection.cpp	2010-11-09 22:01:12 UTC (rev 54173)
@@ -118,7 +118,7 @@
 	{"lsl7",            "Leisure Suit Larry 7: Love for Sail!"},
 	{"lighthouse",      "Lighthouse: The Dark Being"},
 	{"phantasmagoria2", "Phantasmagoria II: A Puzzle of Flesh"},
-	{"shivers2",        "Shivers II: Harvest of Souls"},
+	//{"shivers2",        "Shivers II: Harvest of Souls"},	// Not SCI
 	{"rama",            "RAMA"},
 	{0, 0}
 };
@@ -190,7 +190,7 @@
 	{ "rama",            GID_RAMA },
 	{ "sci-fanmade",     GID_FANMADE },	// FIXME: Do we really need/want this?
 	{ "shivers",         GID_SHIVERS },
-	{ "shivers2",        GID_SHIVERS2 },
+	//{ "shivers2",        GID_SHIVERS2 },	// Not SCI
 	{ "slater",          GID_SLATER },
 	{ "sq1sci",          GID_SQ1 },
 	{ "sq3",             GID_SQ3 },

Modified: scummvm/trunk/engines/sci/detection_tables.h
===================================================================
--- scummvm/trunk/engines/sci/detection_tables.h	2010-11-09 21:31:23 UTC (rev 54172)
+++ scummvm/trunk/engines/sci/detection_tables.h	2010-11-09 22:01:12 UTC (rev 54173)
@@ -2922,7 +2922,15 @@
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, ADGF_DEMO, GUIO_NONE	},
 
-#ifdef ENABLE_SCI3_GAMES
+	// Shivers 2 doesn't contain SCI scripts. The whole game logic has
+	// been reimplemented from SCI in native code placed in DLL files.
+	// Each room has its own DLL file, and some SCI functions have been
+	// reimplemented/rewritten for this purpose in native code. The
+	// game and demo have all the resources of a SCI game, apart from
+	// the SCI scripts themselves. Thus, they cannot be directly
+	// supported, unless their whole room logic is rewritten from
+	// scratch, which classifies Shivers 2 as "not SCI"
+#if 0
 
 	// Shivers2 - English Windows Demo
 	// Executable scanning reports "3.000.000"
@@ -2940,7 +2948,7 @@
 		AD_LISTEND},
 		Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH	},
 
-#endif //ENABLE_SCI3_GAMES
+#endif
 
 #endif // ENABLE_SCI32
 

Modified: scummvm/trunk/engines/sci/sci.h
===================================================================
--- scummvm/trunk/engines/sci/sci.h	2010-11-09 21:31:23 UTC (rev 54172)
+++ scummvm/trunk/engines/sci/sci.h	2010-11-09 22:01:12 UTC (rev 54173)
@@ -166,7 +166,7 @@
 	GID_QFG4,
 	GID_RAMA,
 	GID_SHIVERS,
-	GID_SHIVERS2,
+	//GID_SHIVERS2,	// Not SCI
 	GID_SLATER,
 	GID_SQ1,
 	GID_SQ3,


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