From 7b8add291ebae5360bc8a68a3cc6bc1edae9a998 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Mon, 23 Aug 2010 16:33:19 +0000 Subject: SCI: multiple changes for mother goose vga which is sci1 and sci1.1 fixes bug #3051145 - separating this mother goose from ega and sci2.1 - adding workaround when restoring saved games in these games, games try to calculate restored savedgameid instead of looking it up, we patch this code out and also set the global to the current savedgameid - adding workaround for scripts checking savedgameid to be below 13 (our savedgameids begin at 100 now) - changing official range for savedgameids from 1000->1999 to 100->199, otherwise mother goose would have required much larger patches and this range should be fine even if we replace savedgame dialogs later svn-id: r52301 --- engines/sci/detection.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'engines/sci/detection.cpp') diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index e330bd5f30..3b95434182 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -170,6 +170,7 @@ static const GameIdStrToEnum s_gameIdStrToEnum[] = { { "lsl6hires", GID_LSL6HIRES }, { "lsl7", GID_LSL7 }, { "mothergoose", GID_MOTHERGOOSE }, + { "mothergoose256", GID_MOTHERGOOSE256 }, { "mothergoosehires",GID_MOTHERGOOSEHIRES }, { "msastrochicken", GID_MSASTROCHICKEN }, { "pepper", GID_PEPPER }, -- cgit v1.2.3 From d828b36d766af974c0ba3655730e2703ad588f5b Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Tue, 24 Aug 2010 09:05:54 +0000 Subject: SCI: changing maximum slots from 0-999 to 0-99 svn-id: r52319 --- engines/sci/detection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sci/detection.cpp') diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 3b95434182..9912704790 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -655,7 +655,7 @@ SaveStateList SciMetaEngine::listSaves(const char *target) const { // Obtain the last 3 digits of the filename, since they correspond to the save slot slotNum = atoi(file->c_str() + file->size() - 3); - if (slotNum >= 0 && slotNum < 999) { + if (slotNum >= 0 && slotNum <= 99) { Common::InSaveFile *in = saveFileMan->openForLoading(*file); if (in) { SavegameMetadata meta; @@ -722,7 +722,7 @@ SaveStateDescriptor SciMetaEngine::querySaveMetaInfos(const char *target, int sl return SaveStateDescriptor(); } -int SciMetaEngine::getMaximumSaveSlot() const { return 999; } +int SciMetaEngine::getMaximumSaveSlot() const { return 99; } void SciMetaEngine::removeSaveState(const char *target, int slot) const { Common::String fileName = Common::String::printf("%s.%03d", target, slot); -- cgit v1.2.3 From b7a2fd899e07c3ae47bf5c845aadba6991c33666 Mon Sep 17 00:00:00 2001 From: Martin Kiewitz Date: Fri, 3 Sep 2010 17:49:22 +0000 Subject: SCI: adding mother goose title svn-id: r52507 --- engines/sci/detection.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/sci/detection.cpp') diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 9912704790..fbef406ee7 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -55,6 +55,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = { {"laurabow", "Laura Bow: The Colonel's Bequest"}, {"lsl2", "Leisure Suit Larry 2: Goes Looking for Love (in Several Wrong Places)"}, {"lsl3", "Leisure Suit Larry 3: Passionate Patti in Pursuit of the Pulsating Pectorals"}, + {"mothergoose", "Mixed-Up Mother Goose"}, {"pq2", "Police Quest II: The Vengeance"}, {"qfg1", "Quest for Glory I: So You Want to Be a Hero"}, {"sq3", "Space Quest III: The Pirates of Pestulon"}, @@ -77,6 +78,7 @@ static const PlainGameDescriptor s_sciGameTitles[] = { {"longbow", "Conquests of the Longbow: The Adventures of Robin Hood"}, {"lsl1sci", "Leisure Suit Larry in the Land of the Lounge Lizards"}, {"lsl5", "Leisure Suit Larry 5: Passionate Patti Does a Little Undercover Work"}, + {"mothergoose256", "Mixed-Up Mother Goose"}, {"msastrochicken", "Ms. Astro Chicken"}, {"pq1sci", "Police Quest: In Pursuit of the Death Angel"}, {"pq3", "Police Quest III: The Kindred"}, @@ -94,7 +96,6 @@ static const PlainGameDescriptor s_sciGameTitles[] = { {"sq5", "Space Quest V: The Next Mutation"}, {"islandbrain", "The Island of Dr. Brain"}, {"lsl6", "Leisure Suit Larry 6: Shape Up or Slip Out!"}, - {"mothergoose", "Mixed-Up Mother Goose"}, {"pepper", "Pepper's Adventure in Time"}, {"slater", "Slater & Charlie Go Camping"}, // === SCI2 games ========================================================= -- cgit v1.2.3 From 928bcdbe094767fefb7c415e098d7d9e47bc078d Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sat, 18 Sep 2010 09:47:18 +0000 Subject: SCI: Some changes to the fallback detector (sync with branch 1.2.0) Added more graceful handling of the case where SCI32 isn't built in and the user tries to detect or start a SCI32 game svn-id: r52789 --- engines/sci/detection.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'engines/sci/detection.cpp') diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index fbef406ee7..1944be3358 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -516,6 +516,15 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl resMan->init(); // TODO: Add error handling. +#ifndef ENABLE_SCI32 + // Is SCI32 compiled in? If not, and this is a SCI32 game, + // stop here + if (getSciVersion() >= SCI_VERSION_2) { + delete resMan; + return (const ADGameDescription *)&s_fallbackDesc; + } +#endif + ViewType gameViews = resMan->getViewType(); // Have we identified the game views? If not, stop here @@ -526,15 +535,6 @@ const ADGameDescription *SciMetaEngine::fallbackDetect(const Common::FSList &fsl return 0; } -#ifndef ENABLE_SCI32 - // Is SCI32 compiled in? If not, and this is a SCI32 game, - // stop here - if (getSciVersion() >= SCI_VERSION_2) { - delete resMan; - return (const ADGameDescription *)&s_fallbackDesc; - } -#endif - // EGA views if (gameViews == kViewEga && s_fallbackDesc.platform != Common::kPlatformAmiga) s_fallbackDesc.extra = "EGA"; -- cgit v1.2.3 From c91a07229a8bd841e6b6e77d977254c388a2e407 Mon Sep 17 00:00:00 2001 From: Torbjörn Andersson Date: Sat, 18 Sep 2010 10:55:16 +0000 Subject: JANITORIAL: Removed most punctuation at end of warning() and error() Our warning() and error() functions always add an exclamation mark to the end of the message anyway. svn-id: r52791 --- engines/sci/detection.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/sci/detection.cpp') diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp index 1944be3358..a4d1edf2ed 100644 --- a/engines/sci/detection.cpp +++ b/engines/sci/detection.cpp @@ -765,7 +765,7 @@ Common::Error SciEngine::saveGameState(int slot, const char *desc) { } else { out->finalize(); if (out->err()) { - warning("Writing the savegame failed."); + warning("Writing the savegame failed"); return Common::kWritingFailed; } delete out; -- cgit v1.2.3