diff options
author | Max Horn | 2008-09-01 20:20:20 +0000 |
---|---|---|
committer | Max Horn | 2008-09-01 20:20:20 +0000 |
commit | 5ceb635420b3350d3093bcfb3d5b9c00086ffd66 (patch) | |
tree | 1afc6679499e8fcf13557e3b66a3d170d4422296 /engines/scumm/input.cpp | |
parent | 2a06141644d06e06d0b9c851f3c120dcdd076c24 (diff) | |
parent | 852bc9dbb750b9995d31e70f4158c97d3758c46f (diff) | |
download | scummvm-rg350-5ceb635420b3350d3093bcfb3d5b9c00086ffd66.tar.gz scummvm-rg350-5ceb635420b3350d3093bcfb3d5b9c00086ffd66.tar.bz2 scummvm-rg350-5ceb635420b3350d3093bcfb3d5b9c00086ffd66.zip |
Merging more of the GSoC 2008 RTL branch: SCUMM
svn-id: r34253
Diffstat (limited to 'engines/scumm/input.cpp')
-rw-r--r-- | engines/scumm/input.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/scumm/input.cpp b/engines/scumm/input.cpp index 35028c7e1c..cc98cc00ae 100644 --- a/engines/scumm/input.cpp +++ b/engines/scumm/input.cpp @@ -192,10 +192,6 @@ void ScummEngine::parseEvents() { _keyPressed = Common::KeyState(Common::KEYCODE_6, 54); // '6' break; - case Common::EVENT_QUIT: - _quit = true; - break; - default: break; } @@ -475,7 +471,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0) runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0); - mainMenuDialog(); // Display NewGui + scummMenuDialog(); // Display NewGui if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0) runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0); @@ -514,7 +510,7 @@ void ScummEngine::processKeyboard(Common::KeyState lastKeyHit) { vol = Audio::Mixer::kMaxMixerVolume; ConfMan.setInt("music_volume", vol); - updateSoundSettings(); + syncSoundSettings(); } else if (lastKeyHit.ascii == '-' || lastKeyHit.ascii == '+') { // Change text speed if (lastKeyHit.ascii == '+' && _defaultTalkDelay > 0) |