diff options
| author | Paul Gilbert | 2009-07-07 02:49:33 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2009-07-07 02:49:33 +0000 |
| commit | 5270c82523a1c224e979e436dbb9a75c95c2ec89 (patch) | |
| tree | b4dd0411ef83d2527fb5b3c648b5bd60cf2c5bbe /engines/cruise | |
| parent | 7f7edabbddbd5b797f4d62d9b9fb724bb3dfa797 (diff) | |
| download | scummvm-rg350-5270c82523a1c224e979e436dbb9a75c95c2ec89.tar.gz scummvm-rg350-5270c82523a1c224e979e436dbb9a75c95c2ec89.tar.bz2 scummvm-rg350-5270c82523a1c224e979e436dbb9a75c95c2ec89.zip | |
Bugfix so that user delays work correctly
svn-id: r42197
Diffstat (limited to 'engines/cruise')
| -rw-r--r-- | engines/cruise/cruise_main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index cb51401a29..faea3e1e3a 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -1292,11 +1292,6 @@ int CruiseEngine::processInput(void) { buttonDown = 0; } - if (userDelay && !userWait) { - userDelay--; - return 0; - } - // Check for Exit 'X' key if (keyboardCode == Common::KEYCODE_x) return 1; @@ -1796,6 +1791,11 @@ void CruiseEngine::mainLoop(void) { enableUser = 0; } + if (userDelay && !userWait) { + userDelay--; + continue; + } + if (isUserWait & !userWait) { // User waiting has ended changeScriptParamInList(-1, -1, &procHead, 9999, 0); |