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

[mthreepwood at users.sourceforge.net]

Revision: 54566
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54566&view=rev
Author:   mthreepwood
Date:     2010-11-29 06:35:50 +0000 (Mon, 29 Nov 2010)

Log Message:
-----------
MOHAWK: Set Maggie's Farmyard Adventure as an LB game

The game will start, but has many problems as it uses a later version of the LB code. Also, make sure we check for filename being empty to stop an assertion in the MacCursorManager.

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

Modified: scummvm/trunk/engines/mohawk/cursors.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/cursors.cpp	2010-11-29 01:34:56 UTC (rev 54565)
+++ scummvm/trunk/engines/mohawk/cursors.cpp	2010-11-29 06:35:50 UTC (rev 54566)
@@ -310,12 +310,14 @@
 }
 
 MacCursorManager::MacCursorManager(const Common::String &appName) {
-	_resFork = new Common::MacResManager();
+	if (!appName.empty()) {
+		_resFork = new Common::MacResManager();
 
-	if (!_resFork->open(appName)) {
-		// Not all have cursors anyway, so this is not a problem
-		delete _resFork;
-		_resFork = 0;
+		if (!_resFork->open(appName)) {
+			// Not all have cursors anyway, so this is not a problem
+			delete _resFork;
+			_resFork = 0;
+		}
 	}
 }
 

Modified: scummvm/trunk/engines/mohawk/detection.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/detection.cpp	2010-11-29 01:34:56 UTC (rev 54565)
+++ scummvm/trunk/engines/mohawk/detection.cpp	2010-11-29 06:35:50 UTC (rev 54566)
@@ -105,7 +105,7 @@
 	{"zoombini", "Logical Journey of the Zoombinis Deluxe"},
 	{"csworld", "Where in the World is Carmen Sandiego?"},
 	{"csamtrak", "Where in America is Carmen Sandiego? (The Great Amtrak Train Adventure)"},
-	{"maggiess", "Maggie's Farmyard Adventure"},
+	{"maggiesfa", "Maggie's Farmyard Adventure"},
 	{"jamesmath", "James Discovers/Explores Math"},
 	{"treehouse", "The Treehouse"},
 	{"greeneggs", "Green Eggs and Ham"},
@@ -234,7 +234,6 @@
 		case Mohawk::GType_ZOOMBINI:
 		case Mohawk::GType_CSWORLD:
 		case Mohawk::GType_CSAMTRAK:
-		case Mohawk::GType_MAGGIESS:
 		case Mohawk::GType_JAMESMATH:
 		case Mohawk::GType_TREEHOUSE:
 		case Mohawk::GType_1STDEGREE:

Modified: scummvm/trunk/engines/mohawk/detection_tables.h
===================================================================
--- scummvm/trunk/engines/mohawk/detection_tables.h	2010-11-29 01:34:56 UTC (rev 54565)
+++ scummvm/trunk/engines/mohawk/detection_tables.h	2010-11-29 06:35:50 UTC (rev 54566)
@@ -449,21 +449,36 @@
 
 	{
 		{
-			"maggiess",
+			"maggiesfa",
 			"",
-			AD_ENTRY1("MAGGIESS.MHK", "08f75fc8c0390e68fdada5ddb35d0355"),
+			AD_ENTRY1("Outline", "b7dc6e65fa9e80784a5bb8b557aa37c4"),
 			Common::EN_ANY,
 			Common::kPlatformWindows,
 			ADGF_NO_FLAGS,
 			Common::GUIO_NONE
 		},
-		GType_MAGGIESS,
+		GType_LIVINGBOOKSV3,
 		0,
 		0
 	},
 
 	{
 		{
+			"maggiesfa",
+			"",
+			AD_ENTRY1("BookOutline", "1ce006d7daaa26cf61040203856b88f1"),
+			Common::EN_ANY,
+			Common::kPlatformMacintosh,
+			ADGF_NO_FLAGS,
+			Common::GUIO_NONE
+		},
+		GType_LIVINGBOOKSV3,
+		0,
+		0
+	},
+
+	{
+		{
 			"jamesmath",
 			"",
 			AD_ENTRY1("BRODER.MHK", "007299da8b2c6e8ec1cde9598c243024"),

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-11-29 01:34:56 UTC (rev 54565)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-11-29 06:35:50 UTC (rev 54566)
@@ -1076,6 +1076,13 @@
 			}
 			break;
 
+		case kLBAnimOpUnknownF:
+			// TODO: Found in maggiesfa
+			// Seems to always be a uint32 as the data
+			assert(entry.size == 4);
+			warning("f: UnknownF(%d)", READ_BE_UINT32(entry.data));
+			break;
+
 		default:
 			error("Unknown opcode id %02x (size %d)", entry.opcode, entry.size);
 			break;

Modified: scummvm/trunk/engines/mohawk/livingbooks.h
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.h	2010-11-29 01:34:56 UTC (rev 54565)
+++ scummvm/trunk/engines/mohawk/livingbooks.h	2010-11-29 06:35:50 UTC (rev 54566)
@@ -80,7 +80,8 @@
 	kLBAnimOpWaitForSound = 0xb,
 	kLBAnimOpReleaseSound = 0xc,
 	kLBAnimOpResetSound = 0xd,
-	kLBAnimOpUnknownE = 0xe
+	kLBAnimOpUnknownE = 0xe,
+	kLBAnimOpUnknownF = 0xf
 };
 
 enum {

Modified: scummvm/trunk/engines/mohawk/mohawk.h
===================================================================
--- scummvm/trunk/engines/mohawk/mohawk.h	2010-11-29 01:34:56 UTC (rev 54565)
+++ scummvm/trunk/engines/mohawk/mohawk.h	2010-11-29 06:35:50 UTC (rev 54566)
@@ -55,7 +55,6 @@
 	GType_ZOOMBINI,
 	GType_CSWORLD,
 	GType_CSAMTRAK,
-	GType_MAGGIESS,
 	GType_JAMESMATH,
 	GType_TREEHOUSE,
 	GType_1STDEGREE,


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