From 636789441a7f8666f1c44d941574c3d3e1e49e76 Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Sun, 23 Oct 2011 22:17:47 -0500 Subject: SCUMM: Fix detection of talkie Monkey Island Thanks md5 for the idea to fix the null pointer Thanks clone2727 for feedback on this and other implementations --- engines/scumm/detection.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index 21292fbdcc..a1ad630815 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -649,8 +649,15 @@ static void detectGames(const Common::FSList &fslist, Common::Listid); // Detect if there are speech files in this unknown game - if (detectSpeech(fslist, g)) - warning("FIXME: fix NOSPEECH fallback"); //dr.game.guioptions &= ~GUIO_NOSPEECH; + if (detectSpeech(fslist, g)) { + if (strchr(dr.game.guioptions, GUIO_NOSPEECH[0]) != NULL) { + if (g->id == GID_MONKEY || g->id == GID_MONKEY2) + // TODO: This may need to be updated if something important gets added in the top detection table for these game ids + dr.game.guioptions = GUIO1(GUIO_NONE); + else + warning("FIXME: fix NOSPEECH fallback"); + } + } // Add the game/variant to the candidates list if it is consistent // with the file(s) we are seeing. -- cgit v1.2.3