diff options
| author | James Brown | 2003-01-14 10:33:18 +0000 |
|---|---|---|
| committer | James Brown | 2003-01-14 10:33:18 +0000 |
| commit | 8fa54025623977dfa23bc1ff0801f1bb1a954d21 (patch) | |
| tree | 2119b2e7057d4219b5247fb02ebf61bb14a23c34 /scumm/script_v6.cpp | |
| parent | 5bf741f96076fa5fcdc077d5fe0a6f4557bd1dcc (diff) | |
| download | scummvm-rg350-8fa54025623977dfa23bc1ff0801f1bb1a954d21.tar.gz scummvm-rg350-8fa54025623977dfa23bc1ff0801f1bb1a954d21.tar.bz2 scummvm-rg350-8fa54025623977dfa23bc1ff0801f1bb1a954d21.zip | |
ComI timing hack... very odd.
svn-id: r6454
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index dafe22246d..9993452da9 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -2236,8 +2236,15 @@ void Scumm_v6::o6_delay() void Scumm_v6::o6_delaySeconds() { - // FIXME - are we really measuring minutes here? - uint32 delay = (uint16)pop() * 60; + uint32 delay = (uint32)pop(); + if (_gameId != GID_CMI) + // FIXME - are we really measuring minutes here? + delay = delay * 60; + else + // FIXME - Is this the same in ComI? Seem to need a 1.5 minute + // multiplier for correct timing - see patch 664893 + delay = delay * 90; + vm.slot[_currentScript].delay = delay; vm.slot[_currentScript].status = 1; o6_breakHere(); |