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
This commit is contained in:
Tarek Soliman 2011-10-23 22:17:47 -05:00
parent e2e01dcd35
commit 636789441a

View File

@ -649,8 +649,15 @@ static void detectGames(const Common::FSList &fslist, Common::List<DetectorResul
dr.language = detectLanguage(fslist, g->id);
// 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.