[Scummvm-git-logs] scummvm master -> 9b46b79060310fa4160656d7f146a59ad2674c1d

[dreammaster]

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

Summary:
13458bee27 GLK: COMPREHEND: Correct OO-Topos flag checked for reverse video
9b46b79060 TINSEL: Fix loading of handle table for Tinsel 1


Commit: 13458bee278fe6c85e43022a37f2a2c7189cf20e
    https://github.com/scummvm/scummvm/commit/13458bee278fe6c85e43022a37f2a2c7189cf20e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-11-16T18:02:26-08:00

Commit Message:
GLK: COMPREHEND: Correct OO-Topos flag checked for reverse video

Changed paths:
    engines/glk/comprehend/game_oo.cpp


diff --git a/engines/glk/comprehend/game_oo.cpp b/engines/glk/comprehend/game_oo.cpp
index df83b19615..749ac383a8 100644
--- a/engines/glk/comprehend/game_oo.cpp
+++ b/engines/glk/comprehend/game_oo.cpp
@@ -38,12 +38,12 @@ enum OOToposFlag {
 	OO_FLAG_13 = 13,
 	OO_FLAG_22 = 22,
 	OO_BRIGHT_ROOM = 25,
-	OO_FLAG_WEARING_GOGGLES = 27,	// ?
+	OO_FLAG_WEARING_GOGGLES = 27,
 	OO_FLAG_FLASHLIGHT_ON = 39,
 	OO_FLAG_43 = 43,
 	OO_FLAG_44 = 44,
 	OO_FLAG_SUFFICIENT_FUEL = 51,
-	OO_FLAG_53 = 53,
+	OO_FLAG_REVERSE_VIDEO = 53,	// Effect of wearing goggles
 	OO_FLAG_55 = 55,
 	OO_FLAG_56 = 56,
 	OO_FLAG_58 = 58,
@@ -151,7 +151,7 @@ void OOToposGame::beforeTurn() {
 	} else if (_flags[OO_FLAG_56]) {
 		_currentRoom = 54;
 	} else {
-		YesNo nff = _flags[OO_FLAG_53] ? YES : NO;
+		YesNo nff = _flags[OO_FLAG_REVERSE_VIDEO] ? YES : NO;
 
 		if (_noFloodfill != nff) {
 			_noFloodfill = nff;


Commit: 9b46b79060310fa4160656d7f146a59ad2674c1d
    https://github.com/scummvm/scummvm/commit/9b46b79060310fa4160656d7f146a59ad2674c1d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-11-16T18:56:02-08:00

Commit Message:
TINSEL: Fix loading of handle table for Tinsel 1

Changed paths:
    engines/tinsel/handle.cpp


diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index 4e8eee5316..77ce4e0cf5 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 = TINSEL_V2;
+	bool t2Flag = TinselV2;
 	int RECORD_SIZE = t2Flag ? 24 : 20;
 
 	int len;