From e2d3521d7daf3a7f4caa994ada46a777b800f875 Mon Sep 17 00:00:00 2001
From: Alyssa Milburn
Date: Mon, 31 Jan 2011 23:10:18 +0000
Subject: MOHAWK: LB detection/path updates.

Mark the v2.9x games as v3, mark Rugrats as v4, add detection for
CarmenTQ and add its install directory to the path.

svn-id: r55698
---
 engines/mohawk/detection.cpp      |  4 ++++
 engines/mohawk/detection_tables.h | 29 ++++++++++++++++++++++-------
 engines/mohawk/livingbooks.cpp    |  5 +++++
 engines/mohawk/mohawk.h           |  4 +++-
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index d9d8692047..c9253e4916 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -103,6 +103,7 @@ static const PlainGameDescriptor mohawkGames[] = {
 	{"cstime", "Where in Time is Carmen Sandiego?"},
 	{"csworld", "Where in the World is Carmen Sandiego?"},
 	{"csamtrak", "Where in America is Carmen Sandiego? (The Great Amtrak Train Adventure)"},
+	{"carmentq", "Carmen Sandiego's ThinkQuick Challenge"},
 	{"maggiesfa", "Maggie's Farmyard Adventure"},
 	{"jamesmath", "James Discovers/Explores Math"},
 	{"treehouse", "The Treehouse"},
@@ -131,6 +132,7 @@ static const char *directoryGlobs[] = {
 	"assets1",
 	"data",
 	"program",
+	"95instal",
 	"Rugrats Adventure Game",
 	0
 };
@@ -232,6 +234,8 @@ bool MohawkMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa
 		case Mohawk::GType_LIVINGBOOKSV1:
 		case Mohawk::GType_LIVINGBOOKSV2:
 		case Mohawk::GType_LIVINGBOOKSV3:
+		case Mohawk::GType_LIVINGBOOKSV4:
+		case Mohawk::GType_LIVINGBOOKSV5:
 			*engine = new Mohawk::MohawkEngine_LivingBooks(syst, gd);
 			break;
 		case Mohawk::GType_CSTIME:
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 46de0ad5e6..014d951d64 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -522,6 +522,21 @@ static const MohawkGameDescription gameDescriptions[] = {
 		0
 	},
 
+	{
+		{
+			"carmentq",
+			"",
+			AD_ENTRY1("Outline.txt", "67abce5dcda969c23f367a98c90439bc"),
+			Common::EN_ANY,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			Common::GUIO_NONE
+		},
+		GType_LIVINGBOOKSV5,
+		0,
+		0
+	},
+
 	{
 		{
 			"maggiesfa",
@@ -608,7 +623,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV2,
+		GType_LIVINGBOOKSV3,
 		0,
 		0
 	},
@@ -624,7 +639,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV2,
+		GType_LIVINGBOOKSV3,
 		0,
 		0
 	},
@@ -639,7 +654,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV2,
+		GType_LIVINGBOOKSV3,
 		0,
 		0
 	},
@@ -1003,7 +1018,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV2,
+		GType_LIVINGBOOKSV3,
 		0,
 		0
 	},
@@ -1019,7 +1034,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV2,
+		GType_LIVINGBOOKSV3,
 		0,
 		0
 	},
@@ -1124,7 +1139,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV4,
 		0,
 		0,
 	},
@@ -1139,7 +1154,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV4,
 		0,
 		0,
 	},
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index e9c7b13e14..85fbc79b4a 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -86,8 +86,13 @@ MohawkEngine_LivingBooks::MohawkEngine_LivingBooks(OSystem *syst, const MohawkGa
 	g_eventRec.registerRandomSource(*_rnd, "livingbooks");
 
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
+	// Rugrats
 	SearchMan.addSubDirectoryMatching(gameDataDir, "program");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "Rugrats Adventure Game");
+	// CarmenTQ
+	const Common::FSNode CTQPath = gameDataDir.getChild("95instal");
+	if (CTQPath.exists())
+		SearchMan.addDirectory(CTQPath.getPath(), CTQPath, 0, 4);
 }
 
 MohawkEngine_LivingBooks::~MohawkEngine_LivingBooks() {
diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h
index 6eebe505cf..1bad8a08ce 100644
--- a/engines/mohawk/mohawk.h
+++ b/engines/mohawk/mohawk.h
@@ -62,7 +62,9 @@ enum MohawkGameType {
 	GType_CSUSA,
 	GType_LIVINGBOOKSV1,
 	GType_LIVINGBOOKSV2,
-	GType_LIVINGBOOKSV3
+	GType_LIVINGBOOKSV3,
+	GType_LIVINGBOOKSV4,
+	GType_LIVINGBOOKSV5
 };
 
 enum MohawkGameFeatures {
-- 
cgit v1.2.3