diff options
| author | David Corrales | 2007-05-26 20:23:24 +0000 |
|---|---|---|
| committer | David Corrales | 2007-05-26 20:23:24 +0000 |
| commit | 3646c968c9578c2a94d65ebd5fb06ec835f8c51d (patch) | |
| tree | 8b57b339ebb31a1d7a67f1678aa5dc5c7759070a /engines/sword1/control.cpp | |
| parent | d1f56d93f934150f4b579c2e90564e2bf035f113 (diff) | |
| parent | ac45c5b33d834acbc9718f89be76e49d403a4d2c (diff) | |
| download | scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.gz scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.tar.bz2 scummvm-rg350-3646c968c9578c2a94d65ebd5fb06ec835f8c51d.zip | |
Merged the fs branch with trunk. r26472:26948
svn-id: r26949
Diffstat (limited to 'engines/sword1/control.cpp')
| -rw-r--r-- | engines/sword1/control.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index aeb9da700b..d8cc03bce5 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -327,7 +327,8 @@ uint8 Control::getClicks(uint8 mode, uint8 *retVal) { uint8 flag = 0; if (_keyPressed == 27) flag = kButtonCancel; - else if (_keyPressed == '\r' || _keyPressed == '\n') + // 3 is num keypad Enter on Macs. See FR #1273746 + else if (_keyPressed == '\r' || _keyPressed == '\n' || _keyPressed == 3) flag = kButtonOk; if (flag) { |