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

svn-id: r52217
This commit is contained in:
Arnaud Boutonné 2010-08-19 21:32:54 +00:00
parent 5bd2a99717
commit 67c1997bf4

View File

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