diff options
| author | Max Horn | 2010-12-07 18:00:18 +0000 |
|---|---|---|
| committer | Max Horn | 2010-12-07 18:00:18 +0000 |
| commit | 9a0c20a45fe18f13d02f31c0201248521df8d8a5 (patch) | |
| tree | d2c4b3b153d10fcef73bbc4d68787110293d399a | |
| parent | 20de55129f4cfa1b9ccaa0b04604cb1a0208b2e7 (diff) | |
| download | scummvm-rg350-9a0c20a45fe18f13d02f31c0201248521df8d8a5.tar.gz scummvm-rg350-9a0c20a45fe18f13d02f31c0201248521df8d8a5.tar.bz2 scummvm-rg350-9a0c20a45fe18f13d02f31c0201248521df8d8a5.zip | |
TINSEL: Improve support for DW mac demo (see bug #3110936)
svn-id: r54811
| -rw-r--r-- | engines/tinsel/detection_tables.h | 7 | ||||
| -rw-r--r-- | engines/tinsel/handle.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/scn.cpp | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index 2a523470cc..6894cd0c47 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -78,12 +78,13 @@ static const TinselGameDescription gameDescriptions[] = { 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 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_BIG_ENDIAN, + GF_CD | GF_SCNFILES | GF_BIG_ENDIAN, TINSEL_V1, }, #endif diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index 2307d95a61..a48fd2ca1f 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -107,8 +107,6 @@ void SetupHandleTable() { 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) { diff --git a/engines/tinsel/scn.cpp b/engines/tinsel/scn.cpp index 326fd9e750..17ae7c8687 100644 --- a/engines/tinsel/scn.cpp +++ b/engines/tinsel/scn.cpp @@ -46,8 +46,6 @@ byte *FindChunk(SCNHANDLE handle, uint32 chunk) { 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) && |