[Scummvm-cvs-logs] scummvm master -> a5af61005c4a2f3daacc40c81da06ff344c9bbd3

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a5af61005c TINSEL: Remove the GF_BIG_ENDIAN flag


Commit: a5af61005c4a2f3daacc40c81da06ff344c9bbd3
    https://github.com/scummvm/scummvm/commit/a5af61005c4a2f3daacc40c81da06ff344c9bbd3
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-07-15T05:00:00-07:00

Commit Message:
TINSEL: Remove the GF_BIG_ENDIAN flag

Changed paths:
    engines/tinsel/detection_tables.h
    engines/tinsel/drives.cpp
    engines/tinsel/tinsel.h



diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index 5f305f0..631c2dc 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -86,7 +86,7 @@ static const TinselGameDescription gameDescriptions[] = {
 		},
 		GID_DW1,
 		0,
-		GF_SCNFILES | GF_BIG_ENDIAN,
+		GF_SCNFILES,
 		TINSEL_V1,
 	},
 #endif
@@ -491,7 +491,7 @@ static const TinselGameDescription gameDescriptions[] = {
 		},
 		GID_DW1,
 		0,
-		GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT | GF_BIG_ENDIAN,
+		GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT,
 		TINSEL_V1,
 	},
 
diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp
index 5c4b939..3ecef83 100644
--- a/engines/tinsel/drives.cpp
+++ b/engines/tinsel/drives.cpp
@@ -149,7 +149,7 @@ bool GotoCD() {
 
 bool TinselFile::_warningShown = false;
 
-TinselFile::TinselFile() : ReadStreamEndian((_vm->getFeatures() & GF_BIG_ENDIAN) != 0) {
+TinselFile::TinselFile() : ReadStreamEndian(TinselV1Mac) {
 	_stream = NULL;
 }
 
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index 38c1781..1232491 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -72,9 +72,7 @@ enum TinselGameFeatures {
 	// None of these defined -> 1 language, in ENGLISH.TXT
 	GF_USE_3FLAGS = 1 << 3,	// French, German, Spanish
 	GF_USE_4FLAGS = 1 << 4,	// French, German, Spanish, Italian
-	GF_USE_5FLAGS = 1 << 5,	// All 5 flags
-
-	GF_BIG_ENDIAN = 1 << 6
+	GF_USE_5FLAGS = 1 << 5	// All 5 flags
 };
 
 /**
@@ -135,8 +133,8 @@ typedef bool (*KEYFPTR)(const Common::KeyState &);
 #define TinselV1PSX (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformPSX)
 #define TinselV1Mac (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformMacintosh)
 
-#define READ_16(v) ((_vm->getFeatures() & GF_BIG_ENDIAN) ? READ_BE_UINT16(v) : READ_LE_UINT16(v))
-#define READ_32(v) ((_vm->getFeatures() & GF_BIG_ENDIAN) ? READ_BE_UINT32(v) : READ_LE_UINT32(v))
+#define READ_16(v) (TinselV1Mac ? READ_BE_UINT16(v) : READ_LE_UINT16(v))
+#define READ_32(v) (TinselV1Mac ? READ_BE_UINT32(v) : READ_LE_UINT32(v))
 
 // Global reference to the TinselEngine object
 extern TinselEngine *_vm;