diff options
author | Travis Howell | 2003-05-30 05:39:14 +0000 |
---|---|---|
committer | Travis Howell | 2003-05-30 05:39:14 +0000 |
commit | 0324ae9145bb64db87b0f5171ab63ce789fb9537 (patch) | |
tree | 046ba28eba0f1fed86727330e08f9e790b71b1e3 /simon | |
parent | 37fa2df49acf2991c24c6b7e271ed4431f8dc5c5 (diff) | |
download | scummvm-rg350-0324ae9145bb64db87b0f5171ab63ce789fb9537.tar.gz scummvm-rg350-0324ae9145bb64db87b0f5171ab63ce789fb9537.tar.bz2 scummvm-rg350-0324ae9145bb64db87b0f5171ab63ce789fb9537.zip |
Correct simon2 timing
Remove unused function
svn-id: r8130
Diffstat (limited to 'simon')
-rw-r--r-- | simon/simon.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index a9e6a2acbc..945a0bd5c2 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -2975,15 +2975,6 @@ void SimonState::timer_callback() { } } -void SimonState::checkTimerCallback() { - if (_invoke_timer_callback && !_in_callback) { - _in_callback = true; - _invoke_timer_callback = 0; - timer_callback(); - _in_callback = false; - } -} - void SimonState::fcs_setTextColor(FillOrCopyStruct *fcs, uint value) { fcs->text_color = value; } @@ -4447,7 +4438,14 @@ void SimonState::delay(uint amount) { uint32 start = _system->get_msecs(); uint32 cur = start; - const uint vga_period = _fast_mode ? 10 : 50; + uint vga_period; + + if (_fast_mode) + vga_period = 10; + else if (_game & GF_SIMON2) + vga_period = 40; + else + vga_period = 45; _rnd.getRandomNumber(2); |