[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.341,2.342

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3799/scumm

Modified Files:
	scummvm.cpp 
Log Message:

Allow right mouse click to skip cutscene (Instead of both) in old games, since originals were this way.


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.341
retrieving revision 2.342
diff -u -d -r2.341 -r2.342
--- scummvm.cpp	16 Aug 2003 09:33:45 -0000	2.341
+++ scummvm.cpp	16 Aug 2003 14:24:17 -0000	2.342
@@ -1544,11 +1544,18 @@
 		}
 	}
 
-	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) {