[Scummvm-cvs-logs] SF.net SVN: scummvm:[52217] scummvm/trunk/engines/gob/hotspots.cpp

[strangerke at users.sourceforge.net]

Revision: 52217
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52217&view=rev
Author:   strangerke
Date:     2010-08-19 21:32:54 +0000 (Thu, 19 Aug 2010)

Log Message:
-----------
Fascination - Fix protection screen (and several other glitches like in the very last screen behavior)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/hotspots.cpp

Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp	2010-08-19 18:04:11 UTC (rev 52216)
+++ scummvm/trunk/engines/gob/hotspots.cpp	2010-08-19 21:32:54 UTC (rev 52217)
@@ -778,9 +778,11 @@
 							  ((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 @@
 						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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.