aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Boutonné2010-08-19 21:32:54 +0000
committerArnaud Boutonné2010-08-19 21:32:54 +0000
commit67c1997bf4cb154d0fb59290d96fa4d5c439581c (patch)
treea1c7ead9d42fbe9ae5c799bc8ac453bbf8b8409c
parent5bd2a99717c04ade090a4be77da74ff99a8b0ce3 (diff)
downloadscummvm-rg350-67c1997bf4cb154d0fb59290d96fa4d5c439581c.tar.gz
scummvm-rg350-67c1997bf4cb154d0fb59290d96fa4d5c439581c.tar.bz2
scummvm-rg350-67c1997bf4cb154d0fb59290d96fa4d5c439581c.zip
Fascination - Fix protection screen (and several other glitches like in the very last screen behavior)
svn-id: r52217
-rw-r--r--engines/gob/hotspots.cpp14
1 files changed, 7 insertions, 7 deletions
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