[Scummvm-cvs-logs] SF.net SVN: scummvm:[54462] scummvm/trunk/engines/mohawk

[mthreepwood at users.sourceforge.net]

Revision: 54462
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54462&view=rev
Author:   mthreepwood
Date:     2010-11-24 21:12:21 +0000 (Wed, 24 Nov 2010)

Log Message:
-----------
MOHAWK: Change the unused version detection field to 'appName' for use with LB

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/detection.cpp
    scummvm/trunk/engines/mohawk/detection_tables.h
    scummvm/trunk/engines/mohawk/mohawk.h

Modified: scummvm/trunk/engines/mohawk/detection.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/detection.cpp	2010-11-24 16:01:30 UTC (rev 54461)
+++ scummvm/trunk/engines/mohawk/detection.cpp	2010-11-24 21:12:21 UTC (rev 54462)
@@ -44,7 +44,7 @@
 
 	uint8 gameType;
 	uint32 features;
-	uint16 version;
+	const char *appName;
 };
 
 const char* MohawkEngine::getGameId() const {
@@ -59,8 +59,8 @@
 	return _gameDescription->desc.platform;
 }
 
-uint16 MohawkEngine::getVersion() const {
-	return _gameDescription->version;
+const char *MohawkEngine::getAppName() const {
+	return _gameDescription->appName;
 }
 
 uint8 MohawkEngine::getGameType() const {

Modified: scummvm/trunk/engines/mohawk/detection_tables.h
===================================================================
--- scummvm/trunk/engines/mohawk/detection_tables.h	2010-11-24 16:01:30 UTC (rev 54461)
+++ scummvm/trunk/engines/mohawk/detection_tables.h	2010-11-24 21:12:21 UTC (rev 54462)
@@ -490,7 +490,7 @@
 		},
 		GType_JAMESMATH,
 		GF_HASMIDI,
-		1
+		0
 	},
 
 	{
@@ -520,7 +520,7 @@
 		},
 		GType_LIVINGBOOKSV3,
 		0,
-		0
+		"GREEN.EXE"
 	},
 
 	// 32-bit version of the previous entry
@@ -536,11 +536,26 @@
 		},
 		GType_LIVINGBOOKSV3,
 		0,
-		0
+		"GREEN32.EXE"
 	},
 
 	{
 		{
+			"greeneggs",
+			"",
+			AD_ENTRY1("BookOutline", "5500fa72a6d112b4b3d3573b26a31820"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			Common::GUIO_NONE
+		},
+		GType_LIVINGBOOKSV3,
+		0,
+		"Green Eggs and Ham"
+	},
+
+	{
+		{
 			"1stdegree",
 			"",
 			AD_ENTRY1("AL236_1.MHK", "3ba145492a7b8b4dee0ef4222c5639c3"),
@@ -599,7 +614,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"TORTOISE.EXE"
 	},
 
 	{
@@ -614,7 +629,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"TORTOISE.EXE"
 	},
 
 	{
@@ -629,7 +644,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Living Books Player"
 	},
 
 	{
@@ -644,7 +659,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		0,
-		0
+		"ARTHUR.EXE" // FIXME: Check this (ST?) 
 	},
 
 	{
@@ -659,7 +674,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"ARTHUR.EXE"
 	},
 
 	{
@@ -674,7 +689,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"ARTHUR.EXE"
 	},
 
 	{
@@ -689,7 +704,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Arthur's Teacher Trouble"
 	},
 
 	{
@@ -704,7 +719,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Living Books Player"
 	},
 
 	{
@@ -719,7 +734,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"GRANDMA.EXE"
 	},
 
 	{
@@ -734,7 +749,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"GRANDMA.EXE"
 	},
 
 	{
@@ -749,7 +764,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Just Grandma and Me"
 	},
 
 	{
@@ -764,7 +779,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Living Books Player"
 	},
 
 	{
@@ -779,7 +794,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"RUFF.EXE"
 	},
 
 	{
@@ -794,7 +809,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Living Books Player"
 	},
 
 	{
@@ -809,7 +824,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"NEWKID.EXE"
 	},
 
 	{
@@ -824,7 +839,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"NEWKID.EXE"
 	},
 
 	{
@@ -839,7 +854,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Living Books Player"
 	},
 
 	{
@@ -854,7 +869,7 @@
 		},
 		GType_LIVINGBOOKSV3,
 		0,
-		0
+		0 // FIXME: ST?
 	},
 
 	// 32-bit version of the previous entry
@@ -870,7 +885,7 @@
 		},
 		GType_LIVINGBOOKSV3,
 		0,
-		0
+		0 // FIXME: ST?
 	},
 
 	{
@@ -885,7 +900,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"BIRTHDAY.EXE"
 	},
 
 	{
@@ -900,7 +915,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		GF_DEMO,
-		0
+		"Living Books Player"
 	},
 
 	{
@@ -915,7 +930,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		0,
-		0
+		"MONSTER.EXE"
 	},
 
 	{
@@ -930,7 +945,7 @@
 		},
 		GType_LIVINGBOOKSV1,
 		0,
-		0
+		"Little Monster at School"
 	},
 #endif
 

Modified: scummvm/trunk/engines/mohawk/mohawk.h
===================================================================
--- scummvm/trunk/engines/mohawk/mohawk.h	2010-11-24 16:01:30 UTC (rev 54461)
+++ scummvm/trunk/engines/mohawk/mohawk.h	2010-11-24 21:12:21 UTC (rev 54462)
@@ -87,8 +87,9 @@
 
 	// Detection related functions
 	const MohawkGameDescription *_gameDescription;
-	const char* getGameId() const;
+	const char *getGameId() const;
 	uint32 getFeatures() const;
+	const char *getAppName() const;
 	uint16 getVersion() const;
 	Common::Platform getPlatform() const;
 	uint8 getGameType() const;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.