[Scummvm-git-logs] scummvm master -> 7cbf5a92895cd35c0606a14a76ee48d2e3a0c557

criezy criezy at scummvm.org
Sat Mar 24 19:25:27 CET 2018


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:
7cbf5a9289 SCUMM: Fix interrupting speech not working with AZERTY keyboard


Commit: 7cbf5a92895cd35c0606a14a76ee48d2e3a0c557
    https://github.com/scummvm/scummvm/commit/7cbf5a92895cd35c0606a14a76ee48d2e3a0c557
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-03-24T18:17:24Z

Commit Message:
SCUMM: Fix interrupting speech not working with AZERTY keyboard

On my AZERTY keyboard the period is obtained using SHIFT + ; and
the code checking the PERIOD keycode and no modifier was failing
on both account. The manual for my French DOTT mentions the period
key, but I have not actually checked how it worked with the original
executable and if using the semicolon key without shift or using the
colon key (which would be the period key on a English-US layout)
works.

Changed paths:
    engines/scumm/input.cpp


diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp
index 6ef7e4d..9c5271e 100644
--- a/engines/scumm/input.cpp
+++ b/engines/scumm/input.cpp
@@ -560,7 +560,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) {
 	} else if (pauseKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_SPACE && lastKeyHit.hasFlags(0))) {
 		pauseGame();
 
-	} else if (talkstopKeyEnabled && (lastKeyHit.keycode == Common::KEYCODE_PERIOD && lastKeyHit.hasFlags(0))) {
+	} else if (talkstopKeyEnabled && lastKeyHit.ascii == '.') {
 		_talkDelay = 0;
 		if (_sound->_sfxMode & 2)
 			stopTalk();





More information about the Scummvm-git-logs mailing list