aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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) {