aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2003-12-17 02:23:30 +0000
committerTravis Howell2003-12-17 02:23:30 +0000
commit6b3429c4bbfea21096ae2de520579e99bf3fd3d4 (patch)
tree270c44ab0c666a13ab60d031caa9d52a82879616
parente7bf167428968ac894a8be035a38985c08c0d7c3 (diff)
downloadscummvm-rg350-6b3429c4bbfea21096ae2de520579e99bf3fd3d4.tar.gz
scummvm-rg350-6b3429c4bbfea21096ae2de520579e99bf3fd3d4.tar.bz2
scummvm-rg350-6b3429c4bbfea21096ae2de520579e99bf3fd3d4.zip
Fix restart key in fm towns games
svn-id: r11700
-rw-r--r--scumm/scummvm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 2f2614e6a6..f341bf353c 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1715,7 +1715,7 @@ void ScummEngine::processKbd() {
_lastKeyHit = _keyPressed;
_keyPressed = 0;
- if (_version <= 2 && 315 <= _lastKeyHit && _lastKeyHit < 315+12) {
+ if (((_version <= 2) || (_features & GF_FMTOWNS)) && 315 <= _lastKeyHit && _lastKeyHit < 315+12) {
// Convert F-Keys for V1/V2 games (they start at 1 instead of at 315)
_lastKeyHit -= 314;
}
@@ -1843,7 +1843,7 @@ void ScummEngine::processKbd() {
#endif
if (VAR_RESTART_KEY != 0xFF && _lastKeyHit == VAR(VAR_RESTART_KEY) ||
- (_version <= 2 && _lastKeyHit == 8)) {
+ (((_version <= 2) || (_features & GF_FMTOWNS)) && _lastKeyHit == 8)) {
confirmrestartDialog();
return;
}