diff options
| -rw-r--r-- | scumm/scumm.cpp | 14 | ||||
| -rw-r--r-- | scumm/scumm.h | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index caa6ad0ed2..e7f9d18413 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1834,26 +1834,18 @@ void ScummEngine::processKbd(bool smushMode) { } #ifdef _WIN32_WCE - if (_lastKeyHit == KEY_SET_OPTIONS) { - //_newgui->optionsDialog(); - return; - } - if (_lastKeyHit == KEY_ALL_SKIP) { // Skip cutscene if (smushMode) { - // Eek this is literally shouting for trouble... - // Probably should set _lastKey to VAR_CUTSCENEEXIT_KEY instead! - _videoFinished = true; - return; + _lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY); } else if (vm.cutScenePtr[vm.cutSceneStackPointer]) - _lastKeyHit = (uint16)VAR(VAR_CUTSCENEEXIT_KEY); + _lastKeyHit = (uint)VAR(VAR_CUTSCENEEXIT_KEY); else // Skip talk if (_talkDelay > 0) - _lastKeyHit = (uint16)VAR(VAR_TALKSTOP_KEY); + _lastKeyHit = (uint)VAR(VAR_TALKSTOP_KEY); else // Escape _lastKeyHit = 27; diff --git a/scumm/scumm.h b/scumm/scumm.h index 31b0674acb..ca3974ba05 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -87,7 +87,6 @@ enum { NUM_LOCALSCRIPT = 60, NUM_SENTENCE = 6, NUM_SHADOW_PALETTE = 8, - KEY_SET_OPTIONS = 3456, // WinCE KEY_ALL_SKIP = 3457 // WinCE }; |