From 7ad8dfa0a720ea5b7db502424ba73fb7059824b6 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 17 Jan 2014 23:19:54 -0500
Subject: VOYEUR: Fix switching TV watch gossip to reviewing the tape

---
 engines/voyeur/files_threads.cpp | 8 ++++----
 engines/voyeur/voyeur_game.cpp   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 4b074720c0..850e6dfa06 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -388,7 +388,7 @@ void ThreadResource::parsePlayCommands() {
 					_vm->_graphicsManager._backColors->startFade();
 					_vm->flipPageAndWaitForFade();
 
-					_vm->_voy._field478 = -2;
+					_vm->_voy._field478 &= ~1;
 					_vm->_soundManager.setVOCOffset(_vm->_voy._vocSecondsOffset * 11025);
 					Common::String filename = _vm->_soundManager.getVOCFileName(
 						_vm->_videoId + 159);
@@ -407,7 +407,7 @@ void ThreadResource::parsePlayCommands() {
 					_vm->_eventsManager.incrementTime(1);
 
 					_vm->_bVoy->freeBoltGroup(0x7F00);
-					_vm->_voy._field478 = -17;
+					_vm->_voy._field478 &= ~0x10;
 					_vm->_videoId = -1;
 					_vm->_voy._field470 = 129;
 					parseIndex = 999;
@@ -628,7 +628,7 @@ void ThreadResource::parsePlayCommands() {
 			break;
 
 		case 11:
-			_vm->_voy._field478 = 2;
+			_vm->_voy._field478 |= 2;
 			break;
 
 		case 12:
@@ -1085,7 +1085,7 @@ int ThreadResource::doApt() {
 				// Cursor is within hotspot area
 				hotspotId = idx;
 
-				if (idx != prevHotspotId) {
+				if (hotspotId != prevHotspotId) {
 					// Check for whether to replace hotspot Id for "Watch TV" for
 					// "Review the Tape" if player has already watched the TV
 					if ((_vm->_voy._field478 & 0x100) && (hotspotId == 2))
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 57a08b7d2d..ca8737389a 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -87,7 +87,7 @@ void VoyeurEngine::playStamp() {
 					doGossip();
 					_voy._field46E = true;
 					_voy._field472 = 141;
-					_voy._field478 = -1;
+					_voy._field478 &= ~0x100;
 					break;
 				default:
 					break;
-- 
cgit v1.2.3