[Scummvm-cvs-logs] SF.net SVN: scummvm: [30144] scummvm/trunk/engines/scumm/input.cpp
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Wed Jan 2 12:25:17 CET 2008
Revision: 30144
http://scummvm.svn.sourceforge.net/scummvm/?rev=30144&view=rev
Author: Kirben
Date: 2008-01-02 03:25:17 -0800 (Wed, 02 Jan 2008)
Log Message:
-----------
Fix regression when skipping cutscenes in Maniac Mansion (C64).
Modified Paths:
--------------
scummvm/trunk/engines/scumm/input.cpp
Modified: scummvm/trunk/engines/scumm/input.cpp
===================================================================
--- scummvm/trunk/engines/scumm/input.cpp 2008-01-02 11:15:36 UTC (rev 30143)
+++ scummvm/trunk/engines/scumm/input.cpp 2008-01-02 11:25:17 UTC (rev 30144)
@@ -495,7 +495,8 @@
abortCutscene();
// FIXME: Is the following line really necessary?
- _mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY);
+ if (VAR_CUTSCENEEXIT_KEY != 0xFF)
+ _mouseAndKeyboardStat = VAR(VAR_CUTSCENEEXIT_KEY);
} else if (lastKeyHit.ascii == '[' || lastKeyHit.ascii == ']') { // Change music volume
int vol = ConfMan.getInt("music_volume") / 16;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list