From 67c1997bf4cb154d0fb59290d96fa4d5c439581c Mon Sep 17 00:00:00 2001
From: Arnaud Boutonné
Date: Thu, 19 Aug 2010 21:32:54 +0000
Subject: Fascination - Fix protection screen (and several other glitches like
 in the very last screen behavior)

svn-id: r52217
---
 engines/gob/hotspots.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines')

diff --git a/engines/gob/hotspots.cpp b/engines/gob/hotspots.cpp
index ad7a678359..ba0a65f4d4 100644
--- a/engines/gob/hotspots.cpp
+++ b/engines/gob/hotspots.cpp
@@ -778,9 +778,11 @@ uint16 Hotspots::check(uint8 handleMouse, int16 delay, uint16 &id, uint16 &index
 							  ((delay <= 0) || (_vm->_game->_mouseButtons == kMouseButtonsNone)))
 							_vm->_draw->blitCursor();
 
+
+						if ((key != _currentKey) && (_vm->getGameType() != kGameTypeFascination))
 						// If the hotspot changed, leave the old one
-						if (key != _currentKey)
-							leave(_currentIndex);
+						// Code not present in Fascination executables
+								leave(_currentIndex);
 
 						_currentKey = 0;
 						break;
@@ -800,11 +802,9 @@ uint16 Hotspots::check(uint8 handleMouse, int16 delay, uint16 &id, uint16 &index
 						enter(_currentIndex);
 				} else {
 					WRITE_VAR(16, (int32)i);
-					if (id)
-						id = 0;
-					if (index)
-						index = 0;
-					return(0);
+					id = 0;
+					index = 0;
+					return 0;
 				}
 			} else
 				// No mouse button pressed, check whether the position changed at least
-- 
cgit v1.2.3