[Scummvm-git-logs] scummvm master -> fabf2309e0d21d3e3cb868474731959937036702

[somaen]

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:
fabf2309e0 TINSEL: Let TinselV2 cover both V2 and V3, and add TinselV3.


Commit: fabf2309e0d21d3e3cb868474731959937036702
    https://github.com/scummvm/scummvm/commit/fabf2309e0d21d3e3cb868474731959937036702
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2020-10-31T00:24:53+01:00

Commit Message:
TINSEL: Let TinselV2 cover both V2 and V3, and add TinselV3.

Also adjust SetupHandleTable to use TinselV2 directly,
so that it also works for V3 with the above adjustment.

Some of this is based on kimskoglund's Tinsel Noir
sourceforge repository.

Changed paths:
    engines/tinsel/handle.cpp
    engines/tinsel/tinsel.h


diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index eac283108f..4e8eee5316 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -74,7 +74,7 @@ Handle::~Handle() {
  * permanent graphics etc.
  */
 void Handle::SetupHandleTable() {
-	bool t2Flag = (TinselVersion == TINSEL_V2);
+	bool t2Flag = TINSEL_V2;
 	int RECORD_SIZE = t2Flag ? 24 : 20;
 
 	int len;
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index f7770cfe1c..18c9f992d8 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -102,7 +102,8 @@ typedef bool (*KEYFPTR)(const Common::KeyState &);
 #define TinselVersion (_vm->getVersion())
 #define TinselV0 (TinselVersion == TINSEL_V0)
 #define TinselV1 (TinselVersion == TINSEL_V1)
-#define TinselV2 (TinselVersion == TINSEL_V2)
+#define TinselV2 (TinselVersion == TINSEL_V2 || TinselVersion == TINSEL_V3)
+#define TinselV3 (TinselVersion == TINSEL_V3)
 #define TinselV2Demo (TinselVersion == TINSEL_V2 && _vm->getIsADGFDemo())
 #define TinselV1PSX (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformPSX)
 #define TinselV1Mac (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformMacintosh)