From b998a7ef07ca3b94de43502beac3ed1d08a4795d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 2 Aug 2008 23:01:14 +0000
Subject: Renamed Tinsel v1->v0 (used in the demo only), and v2->v1, to avoid
 confusion with DW2

svn-id: r33553
---
 engines/tinsel/detection.cpp | 59 ++++++++++++++++++++++----------------------
 engines/tinsel/scn.cpp       |  2 +-
 engines/tinsel/tinsel.h      |  4 +--
 3 files changed, 32 insertions(+), 33 deletions(-)

(limited to 'engines/tinsel')

diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index a638dde2c5..7da4192456 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -76,13 +76,28 @@ namespace Tinsel {
 
 static const TinselGameDescription gameDescriptions[] = {
 
-	// Note: versions with *.gra files use tinsel v1 (28/2/1995), whereas
-	// versions with *.scn files tinsel v2 (7/5/1995)
-	// Update: this is not entirely true, there were some versions released
-	// with *.gra files and used tinsel v2
+	// The DW1 demo was based on an older revision of the Tinsel engine
+	// than the one used in the released game. We call it Tinsel v0 as 
+	// opposed to v1 which was used in the full retail version of DW.
+
+	{	// Demo from http://www.adventure-treff.de/specials/dl_demos.php
+		{
+			"dw",
+			"Demo",
+			AD_ENTRY1s("dw.gra", "ce1b57761ba705221bcf70955b827b97", 441192),
+			//AD_ENTRY1s("dw.scn", "ccd72f02183d0e96b6e7d8df9492cda8", 23308),
+			Common::EN_ANY,
+			Common::kPlatformPC,
+			Common::ADGF_DEMO
+		},
+		GID_DW1,
+		0,
+		GF_DEMO,
+		TINSEL_V0,
+	},
 
 	{
-		{	// This version has *.gra files but uses tinsel v2
+		{	// This version has *.gra files
 			"dw",
 			"Floppy",
 			AD_ENTRY1s("dw.gra", "c8808ccd988d603dd35dff42013ae7fd", 781656),
@@ -93,10 +108,10 @@ static const TinselGameDescription gameDescriptions[] = {
 		GID_DW1,
 		0,
 		GF_FLOPPY,
-		TINSEL_V2,
+		TINSEL_V1,
 	},
 
-	{	// English CD v1. This version has *.gra files but uses tinsel v2
+	{	// English CD. This version has *.gra files
 		{
 			"dw",
 			"CD",
@@ -112,10 +127,10 @@ static const TinselGameDescription gameDescriptions[] = {
 		GID_DW1,
 		0,
 		GF_CD,
-		TINSEL_V2,
+		TINSEL_V1,
 	},
 
-	{	// English CD v2
+	{	// English CD with SCN files
 		{
 			"dw",
 			"CD",
@@ -131,11 +146,11 @@ static const TinselGameDescription gameDescriptions[] = {
 		GID_DW1,
 		0,
 		GF_CD | GF_SCNFILES,
-		TINSEL_V2,
+		TINSEL_V1,
 	},
 
 #if 0
-	{	// English Saturn CD
+	{	// English Saturn CD. Not (yet?) supported
 		{
 			"dw",
 			"CD",
@@ -151,25 +166,9 @@ static const TinselGameDescription gameDescriptions[] = {
 		GID_DW1,
 		0,
 		GF_CD,
-		TINSEL_V2,
-	},
-#endif
-
-	{	// Demo from http://www.adventure-treff.de/specials/dl_demos.php
-		{
-			"dw",
-			"Demo",
-			AD_ENTRY1s("dw.gra", "ce1b57761ba705221bcf70955b827b97", 441192),
-			//AD_ENTRY1s("dw.scn", "ccd72f02183d0e96b6e7d8df9492cda8", 23308),
-			Common::EN_ANY,
-			Common::kPlatformPC,
-			Common::ADGF_DEMO
-		},
-		GID_DW1,
-		0,
-		GF_DEMO,
 		TINSEL_V1,
 	},
+#endif
 
 	{	// German CD re-release "Neon Edition"
 		// Note: This release has ENGLISH.TXT (with german content) instead of GERMAN.TXT
@@ -184,9 +183,9 @@ static const TinselGameDescription gameDescriptions[] = {
 		GID_DW1,
 		0,
 		GF_CD | GF_SCNFILES,
-		TINSEL_V2,
+		TINSEL_V1,
 	},
-	
+
 	{ AD_TABLE_END_MARKER, 0, 0, 0, 0 }
 };
 
diff --git a/engines/tinsel/scn.cpp b/engines/tinsel/scn.cpp
index b14b1c5962..8639979b41 100644
--- a/engines/tinsel/scn.cpp
+++ b/engines/tinsel/scn.cpp
@@ -50,7 +50,7 @@ byte *FindChunk(SCNHANDLE handle, uint32 chunk) {
 	// V1 chunk types can be found by substracting 2 from the
 	// chunk type. Note that CHUNK_STRING and CHUNK_BITMAP are
 	// the same in V1 and V2
-	if (_vm->getVersion() == TINSEL_V1 && 
+	if (_vm->getVersion() == TINSEL_V0 && 
 		chunk != CHUNK_STRING && chunk != CHUNK_BITMAP)
 		chunk -= 0x2L;
 
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index 9ffadfe8c1..44cc83af9b 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -59,8 +59,8 @@ enum TinselGameFeatures {
 };
 
 enum TinselEngineVersion {
-	TINSEL_V1 = 1 << 0,
-	TINSEL_V2 = 1 << 1
+	TINSEL_V0 = 1 << 0,	// Used in the DW1 demo only
+	TINSEL_V1 = 1 << 1
 };
 
 struct TinselGameDescription;
-- 
cgit v1.2.3