[Scummvm-cvs-logs] scummvm master -> edd95b3eb6657997f3749fde43d8df7d934be20e
dreammaster
dreammaster at scummvm.org
Sun Aug 30 04:30:21 CEST 2015
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
edd95b3eb6 SHERLOCK: RT: Don't check for gameplay keys when entering copy protection
Commit: edd95b3eb6657997f3749fde43d8df7d934be20e
https://github.com/scummvm/scummvm/commit/edd95b3eb6657997f3749fde43d8df7d934be20e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-29T22:29:43-04:00
Commit Message:
SHERLOCK: RT: Don't check for gameplay keys when entering copy protection
Changed paths:
engines/sherlock/tattoo/tattoo_user_interface.cpp
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 75d436b..160b1ca 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -270,17 +270,18 @@ void TattooUserInterface::handleInput() {
if (events.kbHit()) {
_keyState = events.getKey();
- if (_keyState.keycode == Common::KEYCODE_s && vm._allowFastMode)
- vm._fastMode = !vm._fastMode;
-
- else if (_keyState.keycode == Common::KEYCODE_l && _bgFound != -1) {
- // Beging used for testing that Look dialogs work
- lookAtObject();
-
- } else if (_keyState.keycode == Common::KEYCODE_ESCAPE && vm._runningProlog && !_lockoutTimer) {
+ if (_keyState.keycode == Common::KEYCODE_ESCAPE && vm._runningProlog && !_lockoutTimer) {
vm.setFlags(-76);
vm.setFlags(396);
scene._goToScene = STARTING_GAME_SCENE;
+ } else if (_menuMode == STD_MODE) {
+ if (_keyState.keycode == Common::KEYCODE_s && vm._allowFastMode) {
+ vm._fastMode = !vm._fastMode;
+
+ } else if (_keyState.keycode == Common::KEYCODE_l && _bgFound != -1) {
+ // Beging used for testing that Look dialogs work
+ lookAtObject();
+ }
}
}
More information about the Scummvm-git-logs
mailing list