aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2003-08-16 14:24:17 +0000
committerTravis Howell2003-08-16 14:24:17 +0000
commit293ba87bbf1e33c412ac2d38bb93dec6acd1ffd5 (patch)
tree1b807e73acdd33a3d4bde1d7e8ef7462b71f0279 /scumm
parentc9ece33b810748abf9edee3b1f2a8964c0da1cc6 (diff)
downloadscummvm-rg350-293ba87bbf1e33c412ac2d38bb93dec6acd1ffd5.tar.gz
scummvm-rg350-293ba87bbf1e33c412ac2d38bb93dec6acd1ffd5.tar.bz2
scummvm-rg350-293ba87bbf1e33c412ac2d38bb93dec6acd1ffd5.zip
Allow right mouse click to skip cutscene (Instead of both) in old games, since originals were this way.
svn-id: r9724
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scummvm.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index e332cfad6b..342a17f89a 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1544,13 +1544,20 @@ void Scumm::processKbd() {
}
}
- if (_leftBtnPressed & msClicked && _rightBtnPressed & msClicked) {
+ if (_leftBtnPressed & msClicked && _rightBtnPressed & msClicked && _version > 3) {
// Pressing both mouse buttons is treated as if you pressed
// the cutscene exit key (i.e. ESC in most games). That mimicks
// the behaviour of the original engine where pressing both
// mouse buttons also skips the current cutscene.
_mouseButStat = 0;
_lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY);
+ } else if (_rightBtnPressed & msClicked && (_version < 4 && _gameId != GID_LOOM)) {
+ // Pressing right mouse button is treated as if you pressed
+ // the cutscene exit key (i.e. ESC in most games). That mimicks
+ // the behaviour of the original engine where pressing right
+ // mouse button also skips the current cutscene.
+ _mouseButStat = 0;
+ _lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY);
} else if (_leftBtnPressed & msClicked) {
_mouseButStat = MBS_LEFT_CLICK;
} else if (_rightBtnPressed & msClicked) {