From 581a090204becdf7dbf73ecbc7cccdda105651a7 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Tue, 9 Nov 2010 22:01:12 +0000 Subject: 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" svn-id: r54173 --- engines/sci/detection.cpp | 4 ++-- engines/sci/detection_tables.h | 12 ++++++++++-- engines/sci/sci.h | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index e26e514b02..35c7a70b0e 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -118,7 +118,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = { {"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 @@ static const GameIdStrToEnum s_gameIdStrToEnum[] = { { "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 }, diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 669cff57b0..a54db69e67 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -2922,7 +2922,15 @@ static const struct ADGameDescription SciGameDescriptions[] = { 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 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::EN_ANY, Common::kPlatformWindows, 0, GUIO_NOSPEECH }, -#endif //ENABLE_SCI3_GAMES +#endif #endif // ENABLE_SCI32 diff --git a/engines/sci/sci.h b/engines/sci/sci.h index 606cc008ee..dea8cb23c2 100644 --- a/engines/sci/sci.h +++ b/engines/sci/sci.h @@ -166,7 +166,7 @@ enum SciGameId { GID_QFG4, GID_RAMA, GID_SHIVERS, - GID_SHIVERS2, + //GID_SHIVERS2, // Not SCI GID_SLATER, GID_SQ1, GID_SQ3, -- cgit v1.2.3