diff options
| author | Oliver Kiehl | 2002-12-07 18:00:25 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2002-12-07 18:00:25 +0000 |
| commit | 6049cc9035aae9789565d98532041e1bfbff6df2 (patch) | |
| tree | 9077ecd8c01c6c46a1970b62d6e90d187c9b09aa /simon | |
| parent | a42d84f01ee8082614a4753f1649f2a67a9deac2 (diff) | |
| download | scummvm-rg350-6049cc9035aae9789565d98532041e1bfbff6df2.tar.gz scummvm-rg350-6049cc9035aae9789565d98532041e1bfbff6df2.tar.bz2 scummvm-rg350-6049cc9035aae9789565d98532041e1bfbff6df2.zip | |
cleanup
svn-id: r5871
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 49a90019e9..3e0aa35acc 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -1098,11 +1098,7 @@ void SimonState::setup_cond_c_helper() _left_button_down = 0; do { -#ifdef WIN32 - if (GetAsyncKeyState(VK_F5) != 0 && _bit_array[0] & 0x200) { -#else - if (_bit_array[0] & 0x200) { -#endif + if (_exit_cutscene && (_bit_array[0] & 0x200)) { startSubroutine170(); goto out_of_here; } @@ -1164,14 +1160,9 @@ void SimonState::unlock() { _lock_word |= 1; - if (_lock_counter != 0) { - if (_lock_counter == 1) { -#ifdef WIN32 - GetAsyncKeyState(VK_LBUTTON); -#endif - } + if (_lock_counter != 0) _lock_counter--; - } + _lock_word &= ~1; } |