From cef8d20fb2172b620cf42d0d84c0fc2595d2ce04 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 29 Nov 2010 12:51:53 +0000
Subject: MOHAWK: Divide GType_LIVINGBOOKSV3 into V2 and V3

svn-id: r54570
---
 engines/mohawk/detection.cpp      |  1 +
 engines/mohawk/detection_tables.h | 14 +++++++-------
 engines/mohawk/livingbooks.cpp    |  2 +-
 engines/mohawk/livingbooks.h      |  2 +-
 engines/mohawk/mohawk.h           |  1 +
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/engines/mohawk/detection.cpp b/engines/mohawk/detection.cpp
index d5baa0f73e..c3a276d241 100644
--- a/engines/mohawk/detection.cpp
+++ b/engines/mohawk/detection.cpp
@@ -228,6 +228,7 @@ bool MohawkMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGa
 			*engine = new Mohawk::MohawkEngine_Riven(syst, gd);
 			break;
 		case Mohawk::GType_LIVINGBOOKSV1:
+		case Mohawk::GType_LIVINGBOOKSV2:
 		case Mohawk::GType_LIVINGBOOKSV3:
 			*engine = new Mohawk::MohawkEngine_LivingBooks(syst, gd);
 			break;
diff --git a/engines/mohawk/detection_tables.h b/engines/mohawk/detection_tables.h
index 401383e164..4b53c4db4b 100644
--- a/engines/mohawk/detection_tables.h
+++ b/engines/mohawk/detection_tables.h
@@ -533,7 +533,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"GREEN.EXE"
 	},
@@ -549,7 +549,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"GREEN32.EXE"
 	},
@@ -564,7 +564,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"Green Eggs and Ham"
 	},
@@ -579,7 +579,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"ABC.EXE"
 	},
@@ -595,7 +595,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		"ABC32.EXE"
 	},
@@ -928,7 +928,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		0 // FIXME: ST?
 	},
@@ -944,7 +944,7 @@ static const MohawkGameDescription gameDescriptions[] = {
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_LIVINGBOOKSV3,
+		GType_LIVINGBOOKSV2,
 		0,
 		0 // FIXME: ST?
 	},
diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp
index 506586794d..343e2ad15f 100644
--- a/engines/mohawk/livingbooks.cpp
+++ b/engines/mohawk/livingbooks.cpp
@@ -2039,7 +2039,7 @@ void LBLiveTextItem::readData(uint16 type, uint16 size, Common::SeekableSubReadS
 void LBLiveTextItem::notify(uint16 data, uint16 from) {
 	if (!_paletteIndex) {
 		// TODO
-		warning("Zero palette-index for LiveText; V3 game?");
+		warning("Zero palette-index for LiveText; V2 game?");
 		return;
 	}
 
diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index c297a26eac..a668e7f73d 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -409,7 +409,7 @@ public:
 	void notifyAll(uint16 data, uint16 from);
 	void queueDelayedEvent(DelayedEvent event);
 
-	bool isBigEndian() const { return getGameType() == GType_LIVINGBOOKSV3 || getPlatform() == Common::kPlatformMacintosh; }
+	bool isBigEndian() const { return getGameType() != GType_LIVINGBOOKSV1 || getPlatform() == Common::kPlatformMacintosh; }
 
 private:
 	LivingBooksConsole *_console;
diff --git a/engines/mohawk/mohawk.h b/engines/mohawk/mohawk.h
index 83e2566a09..e7d1902790 100644
--- a/engines/mohawk/mohawk.h
+++ b/engines/mohawk/mohawk.h
@@ -60,6 +60,7 @@ enum MohawkGameType {
 	GType_1STDEGREE,
 	GType_CSUSA,
 	GType_LIVINGBOOKSV1,
+	GType_LIVINGBOOKSV2,
 	GType_LIVINGBOOKSV3
 };
 
-- 
cgit v1.2.3