[Scummvm-cvs-logs] SF.net SVN: scummvm:[54811] scummvm/trunk/engines/tinsel

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Dec 7 19:00:18 CET 2010


Revision: 54811
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54811&view=rev
Author:   fingolfin
Date:     2010-12-07 18:00:18 +0000 (Tue, 07 Dec 2010)

Log Message:
-----------
TINSEL: Improve support for DW mac demo (see bug #3110936)

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/detection_tables.h
    scummvm/trunk/engines/tinsel/handle.cpp
    scummvm/trunk/engines/tinsel/scn.cpp

Modified: scummvm/trunk/engines/tinsel/detection_tables.h
===================================================================
--- scummvm/trunk/engines/tinsel/detection_tables.h	2010-12-07 17:56:08 UTC (rev 54810)
+++ scummvm/trunk/engines/tinsel/detection_tables.h	2010-12-07 18:00:18 UTC (rev 54811)
@@ -78,12 +78,13 @@
 		TINSEL_V1,
 	},
 #if 0
-	{	// Macintosh CD Demo V1 version, with *.scn files
+	{	// Macintosh CD Demo V1 version, with *.scn files, see tracker #3110936
 		{
 			"dw",
 			"CD Demo",
 			{
-				{"dw.scn", 0, "ae291aa4ed7f7caacbfb711b6ff2c8bd", 1286264},
+				{"dw.scn", 0, "cfc40a8d5d476a1c9d3abf826fa46f8c", 1272686},
+				{"english.txt", 0, "c69b5d2067e9114a63569a61e9a82faa", 228878},
 				{"english.smp", 0, NULL, -1},
 			},
 			Common::EN_ANY,
@@ -93,7 +94,7 @@
 		},
 		GID_DW1,
 		0,
-		GF_CD | GF_BIG_ENDIAN,
+		GF_CD | GF_SCNFILES | GF_BIG_ENDIAN,
 		TINSEL_V1,
 	},
 #endif

Modified: scummvm/trunk/engines/tinsel/handle.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/handle.cpp	2010-12-07 17:56:08 UTC (rev 54810)
+++ scummvm/trunk/engines/tinsel/handle.cpp	2010-12-07 18:00:18 UTC (rev 54811)
@@ -107,8 +107,6 @@
 	if (f.open(TinselV1PSX? PSX_INDEX_FILENAME : INDEX_FILENAME)) {
 		// get size of index file
 		len = f.size();
-		if (TinselV1Mac)
-			len -= 2;	// Macintosh version has two redundant ending bytes
 
 		if (len > 0) {
 			if ((len % RECORD_SIZE) != 0) {

Modified: scummvm/trunk/engines/tinsel/scn.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/scn.cpp	2010-12-07 17:56:08 UTC (rev 54810)
+++ scummvm/trunk/engines/tinsel/scn.cpp	2010-12-07 18:00:18 UTC (rev 54811)
@@ -46,8 +46,6 @@
 	byte *bptr = LockMem(handle);
 	uint32 *lptr = (uint32 *)bptr;
 	uint32 add;
-	bool bigEndian = (_vm->getFeatures() & GF_BIG_ENDIAN) != 0;
-	assert(!bigEndian);		// Big endian data not yet supported
 
 	// Initial adjustmnet for Tinsel 1 chunk types
 	if ((TinselVersion != TINSEL_V2) && (chunk >= CHUNK_SCENE) &&


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




More information about the Scummvm-git-logs mailing list